diff --git a/asynnet.c b/asynnet.c
index d59c854d..a30e209a 100644
--- a/asynnet.c
+++ b/asynnet.c
@@ -45,7 +45,7 @@
 #define MAXCONNECTIONS   1024
 #define RBUFFERSIZE       262144 /* 256kb */
 #define WBUFFERSIZE       20*262144
-/* #define WBUFFERSIZE       100*262144 /*
+/* #define WBUFFERSIZE       100*262144 */
 /*--------------------------------------------------------------------------*/
 typedef struct {
   int socket;
diff --git a/commandlog.c b/commandlog.c
index e6439ec7..50192665 100644
--- a/commandlog.c
+++ b/commandlog.c
@@ -536,7 +536,7 @@ int CommandLog(SConnection * pCon, SicsInterp * pSics, void *pData,
       if (iCompact > 0)
         iIntervall = 0;
     }
-    SCPrintf(pCon, eValue, "%s.compact [sec] = %d", argv[0], iCompact);
+    SCPrintf(pCon, eValue, "%s.compact [sec] = %d", argv[0], (int)iCompact);
     return 1;
   } else if (strcmp(argv[1], "close") == 0) {   /* close command */
     fclose(fd);
diff --git a/counter.c b/counter.c
index 0c820901..b5d0cea6 100644
--- a/counter.c
+++ b/counter.c
@@ -1142,7 +1142,7 @@ int CountAction(SConnection * pCon, SicsInterp * pSics, void *pData,
     iRet = self->pDriv->Get(self->pDriv, PaRes.Arg[0].text,
                             PaRes.Arg[1].iVal, &fVal);
     if (iRet == 1) {
-      snprintf(pBueffel,255, "%s.%s %d = %f", argv[0], PaRes.Arg[0].text,
+      snprintf(pBueffel,255, "%s.%s %s = %f", argv[0], PaRes.Arg[0].text,
               PaRes.Arg[1].text, fVal);
       SCWrite(pCon, pBueffel, eValue);
       return 1;
diff --git a/diffscan.c b/diffscan.c
index 6334b0c3..284cb8bb 100644
--- a/diffscan.c
+++ b/diffscan.c
@@ -376,7 +376,7 @@ static int DiffScanTask(void *pData)
   status = GetDrivablePosition(pVar->pObject, self->scanObject->pCon,
                                &fPos);
   if (status == 0) {
-	ReleaseCountLock(pCount->pCountInt);
+    ReleaseCountLock(pCount->pCountInt);
     return finish;
   }
   AppendScanVar(pVar, fPos);
@@ -396,21 +396,21 @@ static int DiffScanTask(void *pData)
     rawCount = data->lCount;
     rawMon = data->Monitors[self->scaleMonitor - 1];
     if(rawMon > 100){
-    	self->normalizationScale = rawMon;
-    	traceSys("diffscan","START:normalizing on %d, scale monitor is %d",
-    			self->normalizationScale, self->scaleMonitor);
+      self->normalizationScale = rawMon;
+      traceSys("diffscan","START:normalizing on %d, scale monitor is %d",
+          self->normalizationScale, self->scaleMonitor);
     } else {
-    	traceSys("diffscan","START:normalization count  %d, on scale monitor is %d and is to low",
-    			rawMon, self->scaleMonitor);
-    	SCWrite(self->scanObject->pCon,"WARNING: Skipping first point because of low count rate", eWarning);
-    	return finish;
+      traceSys("diffscan","START:normalization count  %ld, on scale monitor is %d and is to low",
+          rawMon, self->scaleMonitor);
+      SCWrite(self->scanObject->pCon,"WARNING: Skipping first point because of low count rate", eWarning);
+      return finish;
     }
   } else {
     if (data->Monitors[self->scaleMonitor - 1] -
         self->last.Monitors[self->scaleMonitor - 1] < 5) {
       SCWrite(self->scanObject->pCon, "WARNING: low count rate", eLog);
-      traceSys("diffscan","RUN:low monitor difference from %d to %d",data->Monitors[self->scaleMonitor-1],
-    		  self->last.Monitors[self->scaleMonitor -1]);
+      traceSys("diffscan","RUN:low monitor difference from %ld to %ld",data->Monitors[self->scaleMonitor-1],
+          self->last.Monitors[self->scaleMonitor -1]);
     }
     rawCount = data->lCount;
     rawMon = data->Monitors[self->scaleMonitor - 1];
@@ -441,8 +441,8 @@ static int DiffScanTask(void *pData)
     ReleaseHdbValue(&v);
   }
   InvokeCallBack(self->scanObject->pCall, SCANPOINT, self->scanObject);
-  traceSys("diffscan","RUN: pos, count, rawcount, rawmon: %f, %d, %d, %d",
-		  fPos, countValue, rawCount, rawMon);
+  traceSys("diffscan","RUN: pos, count, rawcount, rawmon: %f, %f, %ld, %ld",
+      fPos, countValue, rawCount, rawMon);
 
   /*
      check for interrupt
@@ -455,7 +455,7 @@ static int DiffScanTask(void *pData)
   }
 
   if(finish == 0) {
-	  ReleaseCountLock(pCount->pCountInt);
+    ReleaseCountLock(pCount->pCountInt);
   }
   
   return finish;
diff --git a/nxxml.c b/nxxml.c
index 12f4de16..131b3afe 100644
--- a/nxxml.c
+++ b/nxxml.c
@@ -779,7 +779,7 @@ NXstatus  NXXputdatatable (NXhandle fid, const void *data){
 }
 
 /*------------------------------------------------------------------------*/
-NXstatus  NXXputdata (NXhandle fid, void *data){
+NXstatus  NXXputdata (NXhandle fid, const void *data){
   pXMLNexus xmlHandle = NULL;
   mxml_node_t *userData = NULL;
   mxml_node_t *current = NULL;
@@ -1074,8 +1074,8 @@ NXstatus  NXXputslabtable (NXhandle fid, const void *data,
     return NX_OK;
 }
 /*----------------------------------------------------------------------*/
-NXstatus  NXXputslab64 (NXhandle fid, void *data,
-				   int64_t iStart[], int64_t iSize[]){
+NXstatus  NXXputslab64 (NXhandle fid, const void *data,
+				   const int64_t iStart[], const int64_t iSize[]){
   
   pXMLNexus xmlHandle = NULL;
   mxml_node_t *userData = NULL;
@@ -1295,7 +1295,7 @@ static char *formatAttributeData(const void *data, int datalen, int iType){
   return number;
 }
 /*---------------------------------------------------------------------*/
-NXstatus  NXXputattr (NXhandle fid, CONSTCHAR *name,  void *data,
+NXstatus  NXXputattr (NXhandle fid, CONSTCHAR *name,  const void *data,
 				   int datalen, int iType){
   char buffer[256];
   pXMLNexus xmlHandle = NULL;
diff --git a/nxxml.h b/nxxml.h
index ee7e9ece..03c09a2c 100644
--- a/nxxml.h
+++ b/nxxml.h
@@ -44,15 +44,15 @@ NXstatus  NXXmakedata64 (NXhandle fid,
 				    int rank, int64_t dimensions[]);
 NXstatus  NXXopendata (NXhandle fid, CONSTCHAR *name);
 NXstatus  NXXclosedata (NXhandle fid);
-NXstatus  NXXputdata (NXhandle fid, void *data);
+NXstatus  NXXputdata (NXhandle fid, const void *data);
 NXstatus  NXXgetdata (NXhandle fid, void *data);
 NXstatus  NXXgetinfo64 (NXhandle fid, int *rank, 
 				   int64_t dimension[], int *iType);
-NXstatus  NXXputslab64 (NXhandle fid, void *data,
-				   int64_t iStart[], int64_t iSize[]);
+NXstatus  NXXputslab64 (NXhandle fid, const void *data,
+				   const int64_t iStart[], const int64_t iSize[]);
 NXstatus  NXXgetslab64 (NXhandle fid, void *data, 
 				   const int64_t iStart[], const int64_t iSize[]);
-NXstatus  NXXputattr (NXhandle fid, CONSTCHAR *name, void *data,
+NXstatus  NXXputattr (NXhandle fid, CONSTCHAR *name, const void *data,
 				   int datalen, int iType);
 NXstatus  NXXgetattr (NXhandle fid, char *name, 
 				   void *data, int* datalen, int* iType);
diff --git a/sansbc.c b/sansbc.c
index 985d70ea..e40e1e44 100644
--- a/sansbc.c
+++ b/sansbc.c
@@ -204,7 +204,7 @@ static int StatCmd(pSICSOBJ self, SConnection *pCon, pHdb commandNode,
 	}
 	average = (double)sum/(double)length;
 	
-	SCPrintf(pCon,eValue,"Stat:sum,max,min,av = %d,%d,%d,%f", sum,max,min,average);
+	SCPrintf(pCon,eValue,"Stat:sum,max,min,av = %ld,%ld,%ld,%f", sum,max,min,average);
 	return 1;
 }
 
diff --git a/simidx.h b/simidx.h
index 17668ecc..b29d14df 100644
--- a/simidx.h
+++ b/simidx.h
@@ -85,6 +85,7 @@ int SimIdxRun();
  * \param errCode pointer to an integer error code
  * \param error A text buffer to hold a description of the error
  * \param errLen The length of error
+ */
 void SimIdxGetError(int *errCode, char *error, int errLen);
 
 /**
diff --git a/statistics.c b/statistics.c
index 406be5a4..da2a622d 100644
--- a/statistics.c
+++ b/statistics.c
@@ -58,7 +58,7 @@ int StatisticsCommand(SConnection * con, SicsInterp * pSics, void *pData,
 
   gettimeofday(&now, 0);
   dif = timeFloat(timeDif(lastStat, now));
-  SCPrintf(con, eLog, "calls/s time[%] full[%] mean[ms]  command");
+  SCPrintf(con, eLog, "calls/s time[%%] full[%%] mean[ms]  command");
   SCPrintf(con, eLog, "----------------------------------------------");
   for (p = list; p != NULL; p = p->next) {
     if (dif > 0) {