diff --git a/include/common/cmdlib.hh b/include/common/cmdlib.hh
index 0ee7b10c..3739758f 100644
--- a/include/common/cmdlib.hh
+++ b/include/common/cmdlib.hh
@@ -619,7 +619,7 @@ public:
         }
 
         if (which & std::ios_base::out) {
-            this->setp(cbase, cbase, cbase + size);
+            this->setp(cbase, cbase + size);
         }
     }
 
diff --git a/include/common/mathlib.hh b/include/common/mathlib.hh
index 475d3b41..12c8c63b 100644
--- a/include/common/mathlib.hh
+++ b/include/common/mathlib.hh
@@ -451,9 +451,9 @@ std::vector<V> PointsAlongLine(const V &start, const V &end, const float step)
         return {};
 
     std::vector<V> result;
+    const int stepCount = static_cast<int>(len / step);
     result.reserve(stepCount + 1);
     const V dir = linesegment / len;
-    const int stepCount = static_cast<int>(len / step);
     for (int i = 0; i <= stepCount; i++) {
         result.push_back(start + (dir * (step * i)));
     }
diff --git a/light/test_light.cc b/light/test_light.cc
index 432f4d3b..5a6657ce 100644
--- a/light/test_light.cc
+++ b/light/test_light.cc
@@ -14,11 +14,6 @@
 
 using namespace std;
 
-static qvec4f extendTo4(const qvec3f &v)
-{
-    return qvec4f(v, 1.0f);
-}
-
 TEST(mathlib, MakeCDF)
 {