diff --git a/src/spicelib/devices/bsim3soi/b4soimask.c b/src/spicelib/devices/bsim3soi/b4soimask.c
index f15f00b4c..a420fc82b 100644
--- a/src/spicelib/devices/bsim3soi/b4soimask.c
+++ b/src/spicelib/devices/bsim3soi/b4soimask.c
@@ -1231,10 +1231,10 @@ IFvalue *value)
             value->iValue = model->B4SOIrgateMod;
             return(OK);
         case B4SOI_MOD_XRCRG1:
-            value->iValue = model->B4SOIxrcrg1; /* FIXME rValue to iValue ? */
+            value->rValue = model->B4SOIxrcrg1; /* Changed from iValue to rvalue */
             return(OK);
         case B4SOI_MOD_XRCRG2:
-            value->iValue = model->B4SOIxrcrg2; /* FIXME rValue to iValue ? */
+            value->rValue = model->B4SOIxrcrg2; /* Changed from iValue to rvalue */
             return(OK);
         case B4SOI_MOD_RSHG:
             value->rValue = model->B4SOIrshg;
diff --git a/src/spicelib/devices/csw/cswacld.c b/src/spicelib/devices/csw/cswacld.c
index 9930c0871..cf95e858f 100644
--- a/src/spicelib/devices/csw/cswacld.c
+++ b/src/spicelib/devices/csw/cswacld.c
@@ -33,7 +33,7 @@ CSWacLoad(GENmodel *inModel, CKTcircuit *ckt)
                 here=here->CSWnextInstance) {
 	    if (here->CSWowner != ARCHme) continue;
 
-            current_state = *(ckt->CKTstate0 + here->CSWstate);
+            current_state = (int)*(ckt->CKTstate0 + here->CSWstate);
 
             g_now = current_state?(model->CSWonConduct):(model->CSWoffConduct);
 
diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c
index a2a1643fe..219cee655 100644
--- a/src/spicelib/devices/csw/cswnoise.c
+++ b/src/spicelib/devices/csw/cswnoise.c
@@ -93,7 +93,7 @@ if (!data->namelist) return(E_NOMEM);
 		switch (mode) {
 
 		case N_DENS:
-		    current_state = *(ckt->CKTstate0 + inst->CSWstate);
+		    current_state = (int)*(ckt->CKTstate0 + inst->CSWstate);
 		    NevalSrc(&noizDens,&lnNdens,ckt,THERMNOISE,
 				 inst->CSWposNode,inst->CSWnegNode,
 				 current_state?(model->CSWonConduct):(model->CSWoffConduct));
diff --git a/src/spicelib/devices/csw/cswpzld.c b/src/spicelib/devices/csw/cswpzld.c
index bee25d2d3..f2cb65658 100644
--- a/src/spicelib/devices/csw/cswpzld.c
+++ b/src/spicelib/devices/csw/cswpzld.c
@@ -35,7 +35,7 @@ CSWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
                 here=here->CSWnextInstance) {
 	    if (here->CSWowner != ARCHme) continue;
 
-            current_state = *(ckt->CKTstate0 + here->CSWstate);
+            current_state = (int)*(ckt->CKTstate0 + here->CSWstate);
 
             g_now = current_state?(model->CSWonConduct):(model->CSWoffConduct);
 
diff --git a/src/spicelib/devices/mos6/mos6load.c b/src/spicelib/devices/mos6/mos6load.c
index 8c8a18774..00c29031b 100644
--- a/src/spicelib/devices/mos6/mos6load.c
+++ b/src/spicelib/devices/mos6/mos6load.c
@@ -82,7 +82,7 @@ MOS6load(GENmodel *inModel, CKTcircuit *ckt)
 #endif /* CAPBYPASS */ 
     int SenCond;
 
-    int m;
+    double m;
 
 #ifdef CAPBYPASS
     senflag = 0;
diff --git a/src/spicelib/devices/soi3/soi3load.c b/src/spicelib/devices/soi3/soi3load.c
index a180d00cb..27668c2b9 100644
--- a/src/spicelib/devices/soi3/soi3load.c
+++ b/src/spicelib/devices/soi3/soi3load.c
@@ -958,7 +958,7 @@ SOI3load(GENmodel *inModel, CKTcircuit *ckt)
 
             double vdsat;
             double Dvdsat_Dvgfb,Dvdsat_Dvsb,Dvdsat_Dvdb,Dvdsat_DdeltaT;
-            int    m,i;
+            int    i;
             double vds2m,vdsat2m,Em,vdslim;
             double Dvdslim_Dvgfb,Dvdslim_Dvdb,Dvdslim_Dvsb,Dvdslim_DdeltaT;
             double Vmx;
diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c
index 9653b58d5..5a75cbab3 100644
--- a/src/spicelib/devices/sw/swnoise.c
+++ b/src/spicelib/devices/sw/swnoise.c
@@ -97,7 +97,7 @@ if (!data->namelist) return(E_NOMEM);
 		switch (mode) {
 
 		case N_DENS:
-		    current_state = *(ckt->CKTstate0 + inst->SWstate);
+		    current_state = (int)*(ckt->CKTstate0 + inst->SWstate);
 		    NevalSrc(&noizDens,&lnNdens,ckt,THERMNOISE,
 				 inst->SWposNode,inst->SWnegNode,
 				 current_state?(model->SWonConduct):(model->SWoffConduct));