Index: trunk/ppStack/src/ppStackConvolve.c
===================================================================
--- trunk/ppStack/src/ppStackConvolve.c	(revision 33702)
+++ trunk/ppStack/src/ppStackConvolve.c	(revision 34089)
@@ -7,5 +7,5 @@
 	psMetadataItem *item = psMetadataLookup(SOURCE->concepts, NAME); \
 	psAssert(item, "Concept should be present");			\
-	psAssert(item->type == PS_TYPE_F32, "Concept should be F32");	\
+	psAssert(item->type == PS_DATA_F32, "Concept should be F32");	\
 	item->data.F32 = VALUE;						\
     }
@@ -101,5 +101,14 @@
         if (!ppStackMatch(readout, target, options, i, config)) {
             // XXX many things can cause a failure of ppStackMatch -- should some be handled differently?
-            psErrorCode error = psErrorCodeLast(); // Error code
+
+	    // gcc -Wswitch complains here if err is declared as type psErrorCode
+	    // the collection of ps*ErrorCode values are enums defined separately for 
+	    // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
+	    // not include the possible psphot values
+
+	    // for now, to get around this, we just use an int for the switch
+
+	    // psErrorCode error = psErrorCodeLast(); // Error code
+	    int error = psErrorCodeLast(); // Error code
             switch (error) {
                 // Fatal errors
Index: trunk/ppStack/src/ppStackFinish.c
===================================================================
--- trunk/ppStack/src/ppStackFinish.c	(revision 33702)
+++ trunk/ppStack/src/ppStackFinish.c	(revision 34089)
@@ -45,5 +45,13 @@
     }
 
-    psErrorCode errorCode = psErrorCodeLast(); // Error code
+    // gcc -Wswitch complains here if err is declared as type psErrorCode
+    // the collection of ps*ErrorCode values are enums defined separately for 
+    // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
+    // not include the possible psphot values
+
+    // for now, to get around this, we just use an int for the switch
+
+    // psErrorCode errorCode = psErrorCodeLast(); // Error code
+    int errorCode = psErrorCodeLast(); // Error code
     if (errorCode == PS_ERR_NONE) {
 	return exitValue;
Index: trunk/ppStack/src/ppStackMatch.c
===================================================================
--- trunk/ppStack/src/ppStackMatch.c	(revision 33702)
+++ trunk/ppStack/src/ppStackMatch.c	(revision 34089)
@@ -460,5 +460,5 @@
             psMetadataItem *item = NULL;// Item from iteration
             while ((item = psMetadataGetAndIncrement(iter))) {
-                assert(item->type == PS_TYPE_F32);
+                assert(item->type == PS_DATA_F32);
                 float norm = item->data.F32; // Normalisation
                 sum += norm;
Index: trunk/ppStack/src/ppStackTarget.c
===================================================================
--- trunk/ppStack/src/ppStackTarget.c	(revision 33702)
+++ trunk/ppStack/src/ppStackTarget.c	(revision 34089)
@@ -191,5 +191,5 @@
 
         float norm = powf(10.0, -0.4 * options->norm->data.F32[i]); // Normalisation from stars
-        float meanVariance = bg->robustMedian * PS_SQR(norm);       // Mean variance in normalised image
+        float meanVariance = mean * PS_SQR(norm);       // Mean variance in normalised image
 
         if (meanVariance < minVariance) {