diff --git a/graph/DelayNormal2.cc b/graph/DelayNormal2.cc
index 5ae66814..2af66427 100644
--- a/graph/DelayNormal2.cc
+++ b/graph/DelayNormal2.cc
@@ -375,11 +375,12 @@ operator/(float delay1,
 
 Delay
 operator*(const Delay &delay1,
-	  float delay2)
+	  float scale)
 {
-  return Delay(delay1.mean() * delay2,
-	       delay1.sigma2Early() * delay2,
-	       delay1.sigma2Late() * delay2);
+  float scale2 = square(scale);
+  return Delay(delay1.mean() * scale,
+	       delay1.sigma2Early() * scale2,
+	       delay1.sigma2Late() * scale2);
 }
 
 float
diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i
index 608125b5..dac36b07 100644
--- a/tcl/StaTcl.i
+++ b/tcl/StaTcl.i
@@ -4020,6 +4020,10 @@ pocv_enabled()
 void
 set_pocv_enabled(bool enabled)
 {
+#if !SSTA
+  if (enabled)
+    Sta::sta()->report()->error("POCV support requires compilation with SSTA=1.\n");
+#endif
   return Sta::sta()->setPocvEnabled(enabled);
 }