diff --git a/JHA/jackpotcoin.cu b/JHA/jackpotcoin.cu
index 965f7c4..29059a3 100644
--- a/JHA/jackpotcoin.cu
+++ b/JHA/jackpotcoin.cu
@@ -96,8 +96,8 @@ extern "C" int scanhash_jackpot(int thr_id, uint32_t *pdata,
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x000f;
 
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 20); // 256*4096
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << 20); // 256*4096
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (!init[thr_id])
 	{
diff --git a/cuda_nist5.cu b/cuda_nist5.cu
index 7879457..e88017f 100644
--- a/cuda_nist5.cu
+++ b/cuda_nist5.cu
@@ -75,7 +75,7 @@ extern "C" int scanhash_nist5(int thr_id, uint32_t *pdata,
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x00FF;
 
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 20); // 256*4096
+	int throughput = opt_work_size ? opt_work_size : (1 << 20); // 256*4096
 	throughput = min(throughput, (int) (max_nonce - first_nonce));
 
 	if (!init[thr_id])
diff --git a/heavy/heavy.cu b/heavy/heavy.cu
index cbb7ebc..860d1c7 100644
--- a/heavy/heavy.cu
+++ b/heavy/heavy.cu
@@ -127,7 +127,7 @@ struct check_nonce_for_remove
     }
 };
 
-static bool init[8] = { 0 };
+static bool init[8] = {0,0,0,0,0,0,0,0};
 
 __host__
 int scanhash_heavy(int thr_id, uint32_t *pdata,
@@ -135,8 +135,8 @@ int scanhash_heavy(int thr_id, uint32_t *pdata,
     unsigned long *hashes_done, uint32_t maxvote, int blocklen)
 {
     const uint32_t first_nonce = pdata[19];
-    // Remove 256 to allow -i 20
-    uint32_t throughput = opt_work_size ? opt_work_size : (1 << 19) - 256; // 256*2048
+    // CUDA will process thousands of threads.
+    int throughput = opt_work_size ? opt_work_size : (1 << 19) - 256; // 256*2048
     throughput = min(throughput, (int)(max_nonce - first_nonce));
 
     int rc = 0;
diff --git a/lyra2/lyra2RE.cu b/lyra2/lyra2RE.cu
index b1865f1..9838614 100644
--- a/lyra2/lyra2RE.cu
+++ b/lyra2/lyra2RE.cu
@@ -64,8 +64,8 @@ extern "C" int scanhash_lyra2(int thr_id, uint32_t *pdata,
 {
 	const uint32_t first_nonce = pdata[19];
 	int intensity = (device_sm[device_map[thr_id]] >= 500 && !is_windows()) ? 18 : 17;
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << intensity); // 18=256*256*4;
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << intensity); // 18=256*256*4;
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x0000ff;
diff --git a/pentablake.cu b/pentablake.cu
index c205c6f..49f49e3 100644
--- a/pentablake.cu
+++ b/pentablake.cu
@@ -492,9 +492,8 @@ extern "C" int scanhash_pentablake(int thr_id, uint32_t *pdata, const uint32_t *
 	const uint32_t first_nonce = pdata[19];
 	uint32_t endiandata[20];
 	int rc = 0;
-	uint32_t throughput = opt_work_size ? opt_work_size : (128 * 2560); // 18.5
-
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (128 * 2560); // 18.5
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x000F;
diff --git a/quark/quarkcoin.cu b/quark/quarkcoin.cu
index c44063a..f52337f 100644
--- a/quark/quarkcoin.cu
+++ b/quark/quarkcoin.cu
@@ -137,8 +137,9 @@ extern "C" int scanhash_quark(int thr_id, uint32_t *pdata,
     unsigned long *hashes_done)
 {
 	const uint32_t first_nonce = pdata[19];
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 20); // 256*4096
-	throughput = min(throughput, max_nonce - first_nonce);
+
+	int throughput = opt_work_size ? opt_work_size : (1 << 20); // 256*4096
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x00F;
diff --git a/qubit/deep.cu b/qubit/deep.cu
index a5e7b4f..f2c5957 100644
--- a/qubit/deep.cu
+++ b/qubit/deep.cu
@@ -69,7 +69,7 @@ extern "C" int scanhash_deep(int thr_id, uint32_t *pdata,
 	if (!init[thr_id])
 	{
 		cudaSetDevice(device_map[thr_id]);
-		CUDA_SAFE_CALL(cudaMalloc(&d_hash[thr_id], 16 * sizeof(uint32_t) * throughput));
+		cudaMalloc(&d_hash[thr_id], 16 * sizeof(uint32_t) * throughput);
 
 		qubit_luffa512_cpu_init(thr_id, throughput);
 		x11_cubehash512_cpu_init(thr_id, throughput);
diff --git a/qubit/qubit.cu b/qubit/qubit.cu
index a155d61..f9c3461 100644
--- a/qubit/qubit.cu
+++ b/qubit/qubit.cu
@@ -80,9 +80,8 @@ extern "C" int scanhash_qubit(int thr_id, uint32_t *pdata,
 {
 	uint32_t endiandata[20];
 	const uint32_t first_nonce = pdata[19];
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8
-
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x0000ff;
diff --git a/x11/s3.cu b/x11/s3.cu
index 12b200c..0b495ac 100644
--- a/x11/s3.cu
+++ b/x11/s3.cu
@@ -57,10 +57,13 @@ extern "C" int scanhash_s3(int thr_id, uint32_t *pdata,
 	unsigned long *hashes_done)
 {
 	const uint32_t first_nonce = pdata[19];
-	int intensity = (device_sm[device_map[thr_id]] >= 500 && !is_windows()) ? 20 : 19;
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << intensity);
-
-	throughput = min(throughput, max_nonce - first_nonce);
+	int intensity = 20; // 256*256*8*2;
+#ifdef WIN32
+	// reduce by one the intensity on windows
+	intensity--;
+#endif
+	int throughput = opt_work_size ? opt_work_size : (1 << intensity);
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0xF;
diff --git a/x11/x11.cu b/x11/x11.cu
index 99dc131..5a561ee 100644
--- a/x11/x11.cu
+++ b/x11/x11.cu
@@ -133,9 +133,8 @@ extern "C" int scanhash_x11(int thr_id, uint32_t *pdata,
 {
 	const uint32_t first_nonce = pdata[19];
 	int intensity = (device_sm[device_map[thr_id]] >= 500 && !is_windows()) ? 20 : 19;
-	uint32_t throughput = opt_work_size ? opt_work_size : intensity; // 20=256*256*16;
-
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << intensity); // 20=256*256*16;
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x5;
diff --git a/x15/whirlpool.cu b/x15/whirlpool.cu
index 192cbd3..a18ce69 100644
--- a/x15/whirlpool.cu
+++ b/x15/whirlpool.cu
@@ -57,8 +57,8 @@ extern "C" int scanhash_whc(int thr_id, uint32_t *pdata,
 {
 	const uint32_t first_nonce = pdata[19];
 	uint32_t endiandata[20];
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x0000ff;
diff --git a/x15/x14.cu b/x15/x14.cu
index 9b71380..d14151c 100644
--- a/x15/x14.cu
+++ b/x15/x14.cu
@@ -163,8 +163,8 @@ extern "C" int scanhash_x14(int thr_id, uint32_t *pdata,
 {
 	const uint32_t first_nonce = pdata[19];
 	uint32_t endiandata[20];
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x000f;
diff --git a/x15/x15.cu b/x15/x15.cu
index 56d1a2b..c714bd3 100644
--- a/x15/x15.cu
+++ b/x15/x15.cu
@@ -174,8 +174,8 @@ extern "C" int scanhash_x15(int thr_id, uint32_t *pdata,
 	const uint32_t first_nonce = pdata[19];
 	uint32_t endiandata[20];
 
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x00FF;
diff --git a/x17/x17.cu b/x17/x17.cu
index ddc01a5..32b6dc7 100644
--- a/x17/x17.cu
+++ b/x17/x17.cu
@@ -191,8 +191,8 @@ extern "C" int scanhash_x17(int thr_id, uint32_t *pdata,
 	unsigned long *hashes_done)
 {
 	const uint32_t first_nonce = pdata[19];
-	uint32_t throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
-	throughput = min(throughput, max_nonce - first_nonce);
+	int throughput = opt_work_size ? opt_work_size : (1 << 19); // 256*256*8;
+	throughput = min(throughput, (int)(max_nonce - first_nonce));
 
 	if (opt_benchmark)
 		((uint32_t*)ptarget)[7] = 0x00ff;