diff --git a/src-core/common/dsp/firdes.cpp b/src-core/common/dsp/firdes.cpp
index ec18b9f7d..c96ea184d 100644
--- a/src-core/common/dsp/firdes.cpp
+++ b/src-core/common/dsp/firdes.cpp
@@ -21,9 +21,7 @@ namespace dsp
                 int iter = i;
                 for (int j = 0; j <= i; j++)
                 {
-                    if (u.size() <= j || v.size() <= iter)
-                        sum;
-                    else
+                    if (!((int)u.size() <= j || (int)v.size() <= iter))
                         sum += u.at(j) * v.at(iter);
                     iter--;
                 }
diff --git a/src-core/common/image/composite.cpp b/src-core/common/image/composite.cpp
index 983500933..827bc1050 100644
--- a/src-core/common/image/composite.cpp
+++ b/src-core/common/image/composite.cpp
@@ -254,8 +254,8 @@ namespace image
                 {
                     int position = channelValues[0] * lut.width();
 
-                    if (position >= lut.width())
-                        position = lut.width() - 1;
+                    if (position >= (int)lut.width())
+                        position = (int)lut.width() - 1;
 
                     for (int c = 0; c < std::min(3, lut.channels()); c++)
                         rgb_output.channel(c)[line * img_width + pixel] = lut.channel(c)[position];
@@ -265,11 +265,11 @@ namespace image
                     int position_x = channelValues[0] * lut.width();
                     int position_y = channelValues[1] * lut.height();
 
-                    if (position_x >= lut.width())
-                        position_x = lut.width() - 1;
+                    if (position_x >= (int)lut.width())
+                        position_x = (int)lut.width() - 1;
 
-                    if (position_y >= lut.height())
-                        position_y = lut.height() - 1;
+                    if (position_y >= (int)lut.height())
+                        position_y = (int)lut.height() - 1;
 
                     for (int c = 0; c < std::min(3, lut.channels()); c++)
                         rgb_output.channel(c)[line * img_width + pixel] = lut.channel(c)[position_y * lut.width() + position_x];
diff --git a/src-core/modules/ccsds/module_ccsds_conv_r2_concat_decoder.cpp b/src-core/modules/ccsds/module_ccsds_conv_r2_concat_decoder.cpp
index 11937635d..f21332e1d 100644
--- a/src-core/modules/ccsds/module_ccsds_conv_r2_concat_decoder.cpp
+++ b/src-core/modules/ccsds/module_ccsds_conv_r2_concat_decoder.cpp
@@ -15,10 +15,10 @@ namespace ccsds
 
           d_constellation_str(parameters["constellation"].get<std::string>()),
 
+          d_oqpsk_delay(parameters.count("oqpsk_delay") > 0 ? parameters["oqpsk_delay"].get<bool>() : false),
           d_cadu_size(parameters["cadu_size"].get<int>()),
           d_cadu_bytes(ceil(d_cadu_size / 8.0)), // If we can't use complete bytes, add one and padding
           d_buffer_size(d_cadu_size),
-          d_oqpsk_delay(parameters.count("oqpsk_delay") > 0 ? parameters["oqpsk_delay"].get<bool>() : false),
 
           d_viterbi_outsync_after(parameters["viterbi_outsync_after"].get<int>()),
           d_viterbi_ber_threasold(parameters["viterbi_ber_thresold"].get<float>()),
diff --git a/src-core/modules/network/module_network_client.cpp b/src-core/modules/network/module_network_client.cpp
index f72f6bd0d..adb764ea6 100644
--- a/src-core/modules/network/module_network_client.cpp
+++ b/src-core/modules/network/module_network_client.cpp
@@ -52,14 +52,14 @@ namespace network
 
         nng_sub0_open_raw(&sock);
         nng_dialer_create(&dialer, sock, std::string("tcp://" + address + ":" + std::to_string(port)).c_str());
-        nng_dialer_start(dialer, NULL);
+        nng_dialer_start(dialer, (int)NULL);
 
         while (input_active.load())
         {
             size_t lpkt_size;
-            nng_recv(sock, buffer, &lpkt_size, NULL);
+            nng_recv(sock, buffer, &lpkt_size, (int)NULL);
 
-            if (pkt_size != lpkt_size)
+            if (pkt_size != (int)lpkt_size)
                 continue;
 
             output_fifo->write(buffer, pkt_size);