diff --git a/include/shared.h b/include/shared.h
index 2c8ab99e8..bc4ab8f25 100644
--- a/include/shared.h
+++ b/include/shared.h
@@ -31,7 +31,7 @@ char *filename_from_filepath (char *filepath);
 void naive_replace (char *s, const char key_char, const char replace_char);
 void naive_escape (char *s, size_t s_max, const char key_char, const char escape_char);
 
-void hc_asprintf (char **strp, const char *fmt, ...);
+__attribute__ ((format (printf, 2, 3))) void hc_asprintf (char **strp, const char *fmt, ...);
 
 void hc_sleep_msec (const u32 msec);
 void hc_sleep      (const u32 sec);
diff --git a/src/dispatch.c b/src/dispatch.c
index c3a36ad1b..02d104919 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -126,7 +126,7 @@ static int calc_stdin (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_par
 
   bool iconv_enabled = false;
 
-  iconv_t iconv_ctx;
+  iconv_t iconv_ctx = NULL;
 
   char *iconv_tmp = NULL;
 
diff --git a/src/monitor.c b/src/monitor.c
index b4ce64e7a..a3b6b41c4 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -58,12 +58,12 @@ static int monitor (hashcat_ctx_t *hashcat_ctx)
   bool hwmon_check        = false;
   bool performance_check  = false;
 
-  const int   sleep_time      = 1;
-  const int   temp_threshold  = 1;      // degrees celcius
-  const int   fan_speed_min   = 33;     // in percentage
-  const int   fan_speed_max   = 100;
-  const float exec_low        = 50.0f;  // in ms
-  const float util_low        = 90.0f;  // in percent
+  const int    sleep_time      = 1;
+  const int    temp_threshold  = 1;      // degrees celcius
+  const int    fan_speed_min   = 33;     // in percentage
+  const int    fan_speed_max   = 100;
+  const double exec_low        = 50.0;  // in ms
+  const double util_low        = 90.0;  // in percent
 
   if (user_options->runtime)
   {
diff --git a/src/user_options.c b/src/user_options.c
index 2361265af..e12ebeb8e 100644
--- a/src/user_options.c
+++ b/src/user_options.c
@@ -111,7 +111,7 @@ static const struct option long_options[] =
   {"version",                   no_argument,       0, IDX_VERSION},
   {"weak-hash-threshold",       required_argument, 0, IDX_WEAK_HASH_THRESHOLD},
   {"workload-profile",          required_argument, 0, IDX_WORKLOAD_PROFILE},
-  {0, 0, 0, 0}
+  {}
 };
 
 static char ENCODING_FROM[] = "utf-8";
@@ -304,8 +304,6 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
 
         return -1;
       }
-
-      break;
     }
   }