diff --git a/src/draw.cpp b/src/draw.cpp
index 86ea59ed..3f13b5d1 100644
--- a/src/draw.cpp
+++ b/src/draw.cpp
@@ -332,7 +332,7 @@ GraphicsWindow::Selection GraphicsWindow::ChooseFromHoverToSelect() {
 
     Group *activeGroup = SK.GetGroup(SS.GW.activeGroup);
     int bestOrder = -1;
-    int bestZIndex;
+    int bestZIndex = 0;
     for(const Hover &hov : hoverList) {
         hGroup hg = {};
         if(hov.selection.entity.v != 0) {
diff --git a/src/drawentity.cpp b/src/drawentity.cpp
index ce455f1d..a5f86c4f 100644
--- a/src/drawentity.cpp
+++ b/src/drawentity.cpp
@@ -297,7 +297,7 @@ void Entity::ComputeInterpolatingSpline(SBezierList *sbl, bool periodic) const {
                 // The wrapping would work, except when n = 1 and everything
                 // wraps to zero...
                 if(i > 0)     bm.A[i][i - 1] = eq.x;
-                              bm.A[i][i]     = eq.y;
+                /**/          bm.A[i][i]     = eq.y;
                 if(i < (n-1)) bm.A[i][i + 1] = eq.z;
             }
         }
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index b1d9f85b..50a51d9d 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -703,7 +703,8 @@ void GraphicsWindow::MenuView(Command id) {
             if(SS.GW.LockedInWorkplane()) {
                 SS.GW.AnimateOntoWorkplane();
                 break;
-            }  // if not in 2d mode fall through and use ORTHO logic
+            }  // if not in 2d mode use ORTHO logic
+            // fallthrough
         case Command::NEAREST_ORTHO:
         case Command::NEAREST_ISO: {
             static const Vector ortho[3] = {
diff --git a/src/mouse.cpp b/src/mouse.cpp
index 9f145b55..dacdffdc 100644
--- a/src/mouse.cpp
+++ b/src/mouse.cpp
@@ -293,6 +293,7 @@ void GraphicsWindow::MouseMoved(double x, double y, bool leftDown,
             } else {
                 SS.GW.pending.hasSuggestion = false;
             }
+            // fallthrough
         case Pending::DRAGGING_NEW_POINT:
             UpdateDraggedPoint(pending.point, x, y);
             HitTestMakeSelection(mp);
diff --git a/src/render/rendergl3.cpp b/src/render/rendergl3.cpp
index c8e6cf36..167ce035 100644
--- a/src/render/rendergl3.cpp
+++ b/src/render/rendergl3.cpp
@@ -277,7 +277,7 @@ void OpenGl3Renderer::InvalidatePixmap(std::shared_ptr<const Pixmap> pm) {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     }
 
-    GLenum format;
+    GLenum format = 0;
     switch(pm->format) {
         case Pixmap::Format::RGBA: format = GL_RGBA;  break;
         case Pixmap::Format::RGB:  format = GL_RGB;   break;
@@ -340,7 +340,7 @@ void OpenGl3Renderer::DoStippledLine(const Vector &a, const Vector &b, hStroke h
         return;
     }
 
-    const char *patternSeq;
+    const char *patternSeq = NULL;
     Stroke s = *stroke;
     s.stipplePattern = StipplePattern::CONTINUOUS;
     hcs = GetStroke(s);
diff --git a/src/resource.cpp b/src/resource.cpp
index 95cfed0f..2722cf82 100644
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -1068,8 +1068,9 @@ int PluralExpr::Token::Precedence() {
                     return 3;
 
                 case Op::NONE:
-                    ssassert(false, "Unexpected operator");
+                    ;
             }
+            ssassert(false, "Unexpected operator");
 
         case Type::QUERY:
         case Type::COLON: