diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index fb5b797e4159787286217771b1910d1443162053..2d84d9e60e3e9feac3b3bfe0fa9bb6b88c02114f 100644
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -84,7 +84,7 @@ FILE *open_file_from_path (char *file, char *mode)
 	}
 
 	if (fp)
-			LOG_DEBUG("opened %s", full_path);
+		LOG_DEBUG("opened %s", full_path);
 
 	return fp;
 	}
diff --git a/src/helper/log.h b/src/helper/log.h
index 6d61cf5f267e0a6fb762f436fbf235cf27a12860..37490a8603d2af47bd4bc0cdbda785d785cb8e00 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -80,7 +80,7 @@ extern int debug_level;
 
 
 #define LOG_DEBUG(expr ...) \
-		if (debug_level >= LOG_LVL_DEBUG) { log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr); }
+		((debug_level >= LOG_LVL_DEBUG) ? log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr) , 0 : 0)
 
 #define LOG_INFO(expr ...) \
 		log_printf_lf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr)
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index cd4b255a90ae07ab6e95262a3bbaa098223a3c56..3a1fbae9d18717e94a7836efc69dcad44d962f05 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1236,7 +1236,7 @@ void jtag_set_check_value(scan_field_t *field, u8 *value, u8 *mask, error_handle
 		field->in_handler = jtag_check_value;
 	else
 		field->in_handler = NULL;	/* No check, e.g. embeddedice uses value==NULL to indicate no check */
-	field->in_handler_priv = NULL;	/* this will be filled in at the invocation site to point to the field duplicate */ 
+	field->in_handler_priv = NULL;
 	field->in_check_value = value;
 	field->in_check_mask = mask;
 }