diff --git a/src/datum_api.c b/src/datum_api.c
index 647975c..2342a04 100644
--- a/src/datum_api.c
+++ b/src/datum_api.c
@@ -430,8 +430,6 @@ bool datum_api_check_admin_password_httponly(struct MHD_Connection * const conne
 }
 
 bool datum_api_check_admin_password(struct MHD_Connection * const connection, const json_t * const j) {
-	int ret;
-	
 	const json_t * const j_password = json_object_get(j, "password");
 	if (json_is_string(j_password)) {
 		return datum_api_check_admin_password_only(connection, json_string_value(j_password));
@@ -590,7 +588,7 @@ int datum_api_cmd(struct MHD_Connection *connection, char *post, int len) {
 			
 			param = json_object_get(root, "empty_thread");
 			if (param) {
-				const int tid = datum_atoi_strict(json_string_value(param), json_string_length(param));
+				tid = datum_atoi_strict(json_string_value(param), json_string_length(param));
 				if (tid != -1) {
 					datum_api_cmd_empty_thread(tid);
 					redirect = "/threads";
diff --git a/src/datum_gateway.h b/src/datum_gateway.h
index 0a32f84..026ccac 100644
--- a/src/datum_gateway.h
+++ b/src/datum_gateway.h
@@ -53,6 +53,6 @@
 
 #define MAX_COINBASE_TXN_SIZE_BYTES (((STRATUM_COINBASE1_MAX_LEN+STRATUM_COINBASE2_MAX_LEN)>>1)+64)
 
-#define STRATUM_JOB_INDEX_XOR 0xC0DE
+#define STRATUM_JOB_INDEX_XOR ((uint16_t)0xC0DE)
 
 #endif
diff --git a/src/datum_stratum.c b/src/datum_stratum.c
index e9c8248..b1fec9a 100644
--- a/src/datum_stratum.c
+++ b/src/datum_stratum.c
@@ -121,7 +121,7 @@ void datum_stratum_v1_shutdown_all(void) {
 		pthread_mutex_unlock(&global_stratum_app->datum_threads[tid].thread_data_lock);
 	}
 	
-	DLOG_INFO("Sent disconnect request for all stratum clients to %d threads.", shutdown_threads);
+	DLOG_INFO("Sent disconnect request for all stratum clients to %u threads.", shutdown_threads);
 	return;
 }
 
@@ -1428,7 +1428,7 @@ int send_mining_notify(T_DATUM_CLIENT_DATA *c, bool clean, bool quickdiff, bool
 	T_DATUM_MINER_DATA * const m = c->app_client_data;
 	T_DATUM_STRATUM_COINBASE *cb;
 	char cb1[STRATUM_COINBASE1_MAX_LEN+2];
-	int cbselect = 0;
+	unsigned int cbselect = 0;
 	bool full_coinbase = false;
 	char s[512];
 	unsigned char tdiff = 0xFF;