Index: /trunk/Ohana/src/relphot/src/ZeroPointModes.c
===================================================================
--- /trunk/Ohana/src/relphot/src/ZeroPointModes.c	(revision 42853)
+++ /trunk/Ohana/src/relphot/src/ZeroPointModes.c	(revision 42854)
@@ -208,11 +208,11 @@
     switch (mode) {
       case ZPT_STARS: 
-	if (CurrentLoop < 3) return TRUE;
-	return FALSE;
-      case ZPT_TGROUP: 
-      case ZPT_MOSAIC:
-      case ZPT_IMAGES:
-      default:
-	if (CurrentLoop < 3) return TRUE;
+	if (CurrentLoop < 5) return TRUE;
+	return FALSE;
+      case ZPT_TGROUP: 
+      case ZPT_MOSAIC:
+      case ZPT_IMAGES:
+      default:
+	if (CurrentLoop < 5) return TRUE;
 	return FALSE;
     }
Index: /trunk/Ohana/src/relphot/src/args.c
===================================================================
--- /trunk/Ohana/src/relphot/src/args.c	(revision 42853)
+++ /trunk/Ohana/src/relphot/src/args.c	(revision 42854)
@@ -556,4 +556,11 @@
     STAGES &= ~STAGE_STACK;
   }
+  // the variability stats are overloaded on the stack and warp fields, so we must do one
+  // or the other.
+  if (VARIABILITY_STATS) {
+    STAGES &= ~STAGE_WARP;
+    STAGES &= ~STAGE_STACK;
+  }
+
   if (!STAGES && NLOOP > 1) {
     fprintf (stderr, "WARNING: no averages requested (all stages skipped), but nloop > 1.  is this wasted effort?\n");