diff --git a/tests/Test_main.cc b/tests/Test_main.cc
index 88d69192..daa6c3aa 100644
--- a/tests/Test_main.cc
+++ b/tests/Test_main.cc
@@ -242,7 +242,7 @@ int main (int argc, char ** argv)
     
 
     { // Peek-ology and Poke-ology, with a little app-ology
-      TComplex      c;
+      Complex      c;
       ColourMatrix c_m;   
       SpinMatrix   s_m;   
       SpinColourMatrix sc_m; 
@@ -299,7 +299,7 @@ int main (int argc, char ** argv)
     }
 
     Bar = zero;
-    Bar = where(lex<10,Foo,Bar);
+    Bar = where(lex<Integer(10),Foo,Bar);
     {
       std::vector<int> coor(4);
       for(coor[3]=0;coor[3]<latt_size[3]/mpi_layout[3];coor[3]++){
@@ -467,7 +467,8 @@ int main (int argc, char ** argv)
         mdiff = shifted1-shifted2;
         amdiff=adj(mdiff);
         ColourMatrix prod = amdiff*mdiff;
-        Real Ttr=real(trace(prod));
+	Complex trprod = trace(prod);
+        Real Ttr=real(trprod);
         double nn=Ttr;
         if ( nn > 0 )
             cout<<"Shift real trace fail "<<coor[0]<<coor[1]<<coor[2]<<coor[3] <<endl;