diff --git a/Makefile.am b/Makefile.am
index e6ee928..cdc75d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ ccminer_SOURCES	= elist.h miner.h compat.h \
 			  quark/cuda_bmw512.cu quark/cuda_quark_keccak512.cu \
 			  quark/quarkcoin.cu quark/animecoin.cu \
 			  quark/cuda_quark_compactionTest.cu  \
-			  neoscrypt.cu neoscrypt/neoscrypt.c neoscrypt/cuda_neoscrypt.cu \
+			  neoscrypt.cpp neoscrypt/neoscrypt.c neoscrypt/cuda_neoscrypt.cu \
 			  cuda_nist5.cu pentablake.cu skein.cu skein2.cu zr5.cu \
 			  sph/bmw.c sph/blake.c sph/groestl.c sph/jh.c sph/keccak.c sph/skein.c \
 			  sph/cubehash.c sph/echo.c sph/luffa.c sph/sha2.c sph/shavite.c sph/simd.c \
diff --git a/ccminer.cpp b/ccminer.cpp
index 8238456..12e0c3a 100644
--- a/ccminer.cpp
+++ b/ccminer.cpp
@@ -2139,8 +2139,9 @@ void parse_arg(int key, char *arg)
 				}
 				for (n=0; n < ngpus; n++)
 					gpus_intensity[n] = (1 << v) + adds;
-				applog(LOG_INFO, "Intensity set to %.1f, %u cuda threads",
-					d, gpus_intensity[0]);
+				if (opt_algo != ALGO_PLUCK && opt_algo != ALGO_NEOSCRYPT)
+					applog(LOG_INFO, "Intensity set to %.1f, %u cuda threads",
+						d, gpus_intensity[0]);
 				break;
 			}
 			while (pch != NULL) {
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
index 7218c00..fa6c230 100644
--- a/ccminer.vcxproj
+++ b/ccminer.vcxproj
@@ -266,6 +266,7 @@
     <ClCompile Include="lyra2\Lyra2.c" />
     <ClCompile Include="lyra2\Sponge.c" />
     <ClCompile Include="neoscrypt\neoscrypt.c" />
+    <ClCompile Include="neoscrypt.cpp" />
     <ClCompile Include="sph\aes_helper.c" />
     <ClCompile Include="sph\blake.c" />
     <ClCompile Include="sph\bmw.c" />
@@ -436,7 +437,6 @@
       <AdditionalOptions Condition="'$(Configuration)'=='Release'">-Xptxas "-abi=yes" %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)'=='Debug'">-Xptxas "-abi=yes" %(AdditionalOptions)</AdditionalOptions>
     </CudaCompile>
-    <CudaCompile Include="neoscrypt.cu" />
     <CudaCompile Include="neoscrypt\cuda_neoscrypt.cu" />
     <CudaCompile Include="pluck\pluck.cu" />
     <CudaCompile Include="pluck\cuda_pluck.cu" />
@@ -536,4 +536,4 @@
   <Target Name="AfterClean">
     <Delete Files="@(FilesToCopy->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
index d89036c..5e65542 100644
--- a/ccminer.vcxproj.filters
+++ b/ccminer.vcxproj.filters
@@ -120,6 +120,9 @@
     <ClCompile Include="groestlcoin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="neoscrypt.cpp">
+      <Filter>Source Files</Filter>
+    </CudaCompile>
     <ClCompile Include="sph\aes_helper.c">
       <Filter>Source Files\sph</Filter>
     </ClCompile>
@@ -625,9 +628,6 @@
     <CudaCompile Include="neoscrypt\cuda_neoscrypt.cu">
       <Filter>Source Files\CUDA</Filter>
     </CudaCompile>
-    <CudaCompile Include="neoscrypt.cu">
-      <Filter>Source Files</Filter>
-    </CudaCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\ccminer.ico">
@@ -644,4 +644,4 @@
       <Filter>Ressources</Filter>
     </Text>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/neoscrypt.cu b/neoscrypt.cpp
similarity index 100%
rename from neoscrypt.cu
rename to neoscrypt.cpp
diff --git a/pluck/pluck.cu b/pluck/pluck.cu
index f2c1f90..0141b30 100644
--- a/pluck/pluck.cu
+++ b/pluck/pluck.cu
@@ -202,6 +202,10 @@ extern "C" int scanhash_pluck(int thr_id, uint32_t *pdata, const uint32_t *ptarg
 			scratchbuf = (uchar*) calloc(opt_pluck_n, 1024);
 
 		pluck_cpu_init(thr_id, throughput, d_hash[thr_id]);
+
+		CUDA_SAFE_CALL(cudaGetLastError());
+		applog(LOG_INFO, "Using %d cuda threads", throughput);
+
 		init[thr_id] = true;
 	}