Index: trunk/ppSub/src/ppSubMatchPSFs.c
===================================================================
--- trunk/ppSub/src/ppSubMatchPSFs.c	(revision 32676)
+++ trunk/ppSub/src/ppSubMatchPSFs.c	(revision 34089)
@@ -266,5 +266,5 @@
         if (!detections->allSources) {
             psFree(detections);
-            psErrorCode error = psErrorCodeLast(); // Error code
+            int error = psErrorCodeLast(); // Error code
             if (error == PM_ERR_OBJECTS) {
                 psErrorStackPrint(stderr, "Unable to match source lists");
@@ -439,5 +439,5 @@
 
     if (!success) {
-        psErrorCode error = psErrorCodeLast(); // Error code
+        int error = psErrorCodeLast(); // Error code
         if (error == PM_ERR_STAMPS) {
             psErrorStackPrint(stderr, "Unable to find stamps");
@@ -471,8 +471,8 @@
             psRegion *region = regItem->data.V; // Region of interest
             psMetadataItem *modeItem = psMetadataGetAndIncrement(modeIter); // Item with mode
-            psAssert(modeItem && modeItem->type == PS_TYPE_S32, "Expect subtraction mode");
+            psAssert(modeItem && modeItem->type == PS_DATA_S32, "Expect subtraction mode");
             pmSubtractionMode mode = modeItem->data.S32; // Subtraction mode
             psMetadataItem *normItem = psMetadataGetAndIncrement(normIter); // Item with normalisation
-            psAssert(normItem && normItem->type == PS_TYPE_F32 && isfinite(normItem->data.F32),
+            psAssert(normItem && normItem->type == PS_DATA_F32 && isfinite(normItem->data.F32),
                      "Expect normalisation");
             float norm = normItem->data.F32; // Normalisation