diff --git a/Grid/simd/Simd.h b/Grid/simd/Simd.h
index a5b32ac0..bc8cd2fd 100644
--- a/Grid/simd/Simd.h
+++ b/Grid/simd/Simd.h
@@ -194,7 +194,9 @@ accelerator_inline void sub (Integer * __restrict__ y,const Integer * __restrict
 accelerator_inline void add (Integer * __restrict__ y,const Integer * __restrict__ l,const Integer *__restrict__ r){ *y = (*l) + (*r); }
 accelerator_inline void vstream(Integer &l, const RealD &r){ l=r;}
 template<>            accelerator_inline void zeroit(Integer &arg)   { arg=0; };
+
 accelerator_inline Integer mod (Integer a,Integer y) { return a%y;}
+accelerator_inline Integer div (Integer a,Integer y) { return a/y;}
 //accelerator_inline Integer abs (Integer &a) { return a%y;}
 
 //////////////////////////////////////////////////////////
diff --git a/tests/core/Test_staggered5DvecF.cc b/tests/core/Test_staggered5DvecF.cc
index dbdbbc12..0db239c5 100644
--- a/tests/core/Test_staggered5DvecF.cc
+++ b/tests/core/Test_staggered5DvecF.cc
@@ -33,6 +33,7 @@ using namespace Grid;
 
 int main (int argc, char ** argv)
 {
+#ifndef GRID_NVCC
   Grid_init(&argc,&argv);
 
   auto latt_size   = GridDefaultLatt();
@@ -192,4 +193,5 @@ int main (int argc, char ** argv)
 
 
   Grid_finalize();
+#endif
 }
diff --git a/tests/solver/Test_dwf_hdcr.cc b/tests/solver/Test_dwf_hdcr.cc
index 626f5be7..58bf9032 100644
--- a/tests/solver/Test_dwf_hdcr.cc
+++ b/tests/solver/Test_dwf_hdcr.cc
@@ -242,7 +242,7 @@ public:
     FineField vec1(src.Grid());
     FineField vec2(src.Grid());
 
-    const Integer block=params.domainsize;
+    const RealD block=params.domainsize;
 
     subset=Zero();
     for(int mu=0;mu<Nd;mu++){