diff --git a/common/reflectivity/reflectivity.cpp b/common/reflectivity/reflectivity.cpp
index 33d2240725..8070934018 100644
--- a/common/reflectivity/reflectivity.cpp
+++ b/common/reflectivity/reflectivity.cpp
@@ -119,7 +119,7 @@ float reflectivity::get_reflectivity( float raw_noise_estimation,
 
     // STD based analysis
     // STD values are at the edges, hard to get data
-    if( standard_deviation >= 1.5f || standard_deviation <= 10.f )
+    if( standard_deviation >= 1.5f && standard_deviation <= 10.f )
     {
         if( standard_deviation > 2.5f )
             ref_from_std = 0.5f;  // Low confidence data due to low STD values
diff --git a/common/viewer.h b/common/viewer.h
index 4bd83fab72..53f6fcc5ae 100644
--- a/common/viewer.h
+++ b/common/viewer.h
@@ -19,7 +19,7 @@ namespace rs2
         const std::string message;
         std::function<void()> custom_command;
 
-        bool operator =(const popup& p)
+        bool operator ==(const popup& p)
         {
             return p.message == message;
         }
diff --git a/src/context.cpp b/src/context.cpp
index 8a3bcac62d..4bd363cf07 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -583,7 +583,7 @@ namespace librealsense
     void context::remove_device(const std::string& file)
     {
         auto it = _playback_devices.find(file);
-        if (!it->second.lock() || it == _playback_devices.end())
+        if(it == _playback_devices.end() || !it->second.lock())
         {
             //Not found
             return;
diff --git a/src/l500/l500-device.cpp b/src/l500/l500-device.cpp
index e2ae03d01e..042c73a73a 100644
--- a/src/l500/l500-device.cpp
+++ b/src/l500/l500-device.cpp
@@ -664,7 +664,7 @@ namespace librealsense
                
                         std::lock_guard<std::mutex> lock(_temperature_mutex);
 
-                        memset(&_temperatures, sizeof(_temperatures), 0);
+                        memset(&_temperatures, 0, sizeof(_temperatures));
                         if (fw_version_support_nest)
                             _temperatures = *reinterpret_cast<extended_temperatures const *>(res.data());
                         else
diff --git a/tools/embed/rs-embed.cpp b/tools/embed/rs-embed.cpp
index 5d230225c0..4254962ed7 100644
--- a/tools/embed/rs-embed.cpp
+++ b/tools/embed/rs-embed.cpp
@@ -144,7 +144,7 @@ int main(int argc, char** argv) try
         auto rawDataSize = (int)data.size();
         auto compressBufSize = LZ4_compressBound(rawDataSize);
         char* pchCompressed = new char[compressBufSize];
-        memset(pchCompressed, compressBufSize, 0);
+        memset(pchCompressed, 0, compressBufSize);
         int nCompressedSize = LZ4_compress_default((const char*)data.data(), pchCompressed, rawDataSize, compressBufSize);
 
   
diff --git a/tools/rs-server/RsSimpleRTPSink.cpp b/tools/rs-server/RsSimpleRTPSink.cpp
index 5556506a42..d6f26ab3c1 100644
--- a/tools/rs-server/RsSimpleRTPSink.cpp
+++ b/tools/rs-server/RsSimpleRTPSink.cpp
@@ -141,6 +141,11 @@ RsSimpleRTPSink ::RsSimpleRTPSink(UsageEnvironment& t_env,
     sprintf(m_fFmtpSDPLine, "a=fmtp:%d;%s\r\n", rtpPayloadType(), sdpStr.c_str());
 }
 
+RsSimpleRTPSink::~RsSimpleRTPSink()
+{
+    delete[] m_fFmtpSDPLine;
+}
+
 char const* RsSimpleRTPSink::auxSDPLine()
 {
     return m_fFmtpSDPLine;
diff --git a/tools/rs-server/RsSimpleRTPSink.h b/tools/rs-server/RsSimpleRTPSink.h
index 173a29871a..654f24bd3a 100644
--- a/tools/rs-server/RsSimpleRTPSink.h
+++ b/tools/rs-server/RsSimpleRTPSink.h
@@ -34,6 +34,7 @@ class RsSimpleRTPSink : public SimpleRTPSink
                     unsigned numChannels = 1,
                     Boolean allowMultipleFramesPerPacket = True,
                     Boolean doNormalMBitRule = True);
+    ~RsSimpleRTPSink();
 
 private:
     char* m_fFmtpSDPLine;