diff --git a/amorscan.c b/amorscan.c
index 4d11eeb..d7d375e 100644
--- a/amorscan.c
+++ b/amorscan.c
@@ -31,7 +31,7 @@
     {
         return WriteAmorScan(self->pFile,self->pCon,self);
     }
-    return 1; /* guessed return value M.Z. */
+    return 1; 
   } 
 /*--------------------------------------------------------------------*/
   static int AmorCollect(pScanData self, int iP)
diff --git a/ecbdriv.c b/ecbdriv.c
index 81a34b7..740b21e 100644
--- a/ecbdriv.c
+++ b/ecbdriv.c
@@ -530,35 +530,35 @@ static int downloadECBParam(pECBMotDriv self){
     return 0;
   }
 
-  if((status = loadSpeed(self,ObVal(self->driverPar,STARTSPEED),6) <= 0)){
+  if((status = loadSpeed(self,ObVal(self->driverPar,STARTSPEED),6)) <= 0){
     return 0;
   }
 
-  if((status = loadSpeed(self,ObVal(self->driverPar,MAXSPEED),5) <= 0)){
+  if((status = loadSpeed(self,ObVal(self->driverPar,MAXSPEED),5)) <= 0){
     return 0;
   }
 
-  if((status = loadSpeed(self,ObVal(self->driverPar,SLOWAUTO),4) <= 0)){
+  if((status = loadSpeed(self,ObVal(self->driverPar,SLOWAUTO),4)) <= 0){
     return 0;
   }
 
-  if((status = loadSpeed(self,ObVal(self->driverPar,SLOWMAN),10) <= 0)){
+  if((status = loadSpeed(self,ObVal(self->driverPar,SLOWMAN),10)) <= 0){
     return 0;
   }
 
-  if((status = loadDelay(self) <= 0)){
+  if((status = loadDelay(self)) <= 0){
     return 0;
   }
 
-  if((status = loadMulti(self) <= 0)){
+  if((status = loadMulti(self)) <= 0){
     return 0;
   }
 
-  if((status = ecbLoadEncoder(self->ecb) <= 0)){
+  if((status = ecbLoadEncoder(self->ecb)) <= 0){
     return 0;
   }
 
-  if((status = loadOffset(self,ObVal(self->driverPar,OFFSET)) <= 0)){
+  if((status = loadOffset(self,ObVal(self->driverPar,OFFSET))) <= 0){
     return 0;
   }
   
@@ -572,7 +572,7 @@ static int downloadECBParam(pECBMotDriv self){
     self->driverPar[MULT].fVal = .0;
   }
 
-  if((status = loadGearing(self) <= 0)){
+  if((status = loadGearing(self)) <= 0){
     return 0;
   }
 
diff --git a/el737hpdriv.c b/el737hpdriv.c
index ded8170..1217f07 100644
--- a/el737hpdriv.c
+++ b/el737hpdriv.c
@@ -503,7 +503,7 @@ static int EL737FixIt(struct __COUNTER *self, int iCode){
     break;
   case TOMANYCOUNTS:
   case SYSERROR:
-    return COTERM; /* guessed return value M.Z. */
+    return COTERM; 
     break;
   default:
     /*
diff --git a/faverage.c b/faverage.c
index e25d865..22f3a53 100644
--- a/faverage.c
+++ b/faverage.c
@@ -554,5 +554,5 @@ HistInt *CheckBank(pFocusAverager self, SConnection *pCon,
        mergData = getFMBankPointer(4);
        return mergData;    
     }
-  return NULL; /* inserted statement, guessed return value M.Z */
+  return NULL; 
 }
diff --git a/nextrics.c b/nextrics.c
index f84a7bb..0a5ce10 100644
--- a/nextrics.c
+++ b/nextrics.c
@@ -1243,6 +1243,7 @@ name of hkl object holding crystallographic information
         free(self->pCurrentFile);
      
      pText = makeFilename(pServ->pSics,pCon);
+     changeExtension(pText,"hdf");
      if(pText == NULL)
      {
        return 0;
diff --git a/tasinit.c b/tasinit.c
index 77dd710..6c5c5df 100644
--- a/tasinit.c
+++ b/tasinit.c
@@ -309,6 +309,7 @@ static int A6WaitCallback(int iEvent, void *pEventData, void *pUserData)
   {
     SicsWait(5);
   }
+  return 1;
 }
 /*-----------------------------------------------------------------------
   A function for killing the TAS data structure is needed
diff --git a/tricssupport.c b/tricssupport.c
index 4c7df35..e4e854a 100644
--- a/tricssupport.c
+++ b/tricssupport.c
@@ -199,7 +199,8 @@ int TricsSupportAction(SConnection *pCon, SicsInterp *pSics, void *pData,
     SCSendOK(pCon);
     return 1;
   } else {
-    return 0; /* guessed return value M.Z. */
+    SCWrite(pCon,"ERROR: subcommand to tricssuport not understood",eError);
+    return 0; 
   }
 }