diff --git a/src/Mod/Spreadsheet/App/Expression.cpp b/src/Mod/Spreadsheet/App/Expression.cpp
index 6585a7dde..a06340b21 100644
--- a/src/Mod/Spreadsheet/App/Expression.cpp
+++ b/src/Mod/Spreadsheet/App/Expression.cpp
@@ -111,7 +111,7 @@ bool Path::operator <(const Path &other) const
     if (components.size() > other.components.size())
         return false;
 
-    for (int i = 0; i < components.size(); ++i) {
+    for (std::size_t i = 0; i < components.size(); ++i) {
         if (components[i].component < other.components[i].component)
             return true;
         if (components[i].component > other.components[i].component)
@@ -448,8 +448,8 @@ TYPESYSTEM_SOURCE(Spreadsheet::OperatorExpression, Spreadsheet::Expression);
 
 OperatorExpression::OperatorExpression(const App::DocumentObject *_owner, Expression * _left, Operator _op, Expression * _right)
     : UnitExpression(_owner)
-    , left(_left)
     , op(_op)
+    , left(_left)
     , right(_right)
 {
 
@@ -593,6 +593,8 @@ std::string OperatorExpression::toString() const
     case POS:
         s << "+";
         break;
+    default:
+        break;
     }
 
     if (left->priority() < priority())
@@ -843,6 +845,8 @@ Expression * FunctionExpression::eval() const
                 if (first || value > q)
                     q = value;
                 break;
+            default:
+                break;
             }
 
             first = false;
@@ -858,6 +862,8 @@ Expression * FunctionExpression::eval() const
             else
                 q = (M2 / (n - 1.0)).pow(Quantity(0.5));
             break;
+        default:
+            break;
         }
 
         return new NumberExpression(owner, q);
@@ -1054,6 +1060,7 @@ Expression *FunctionExpression::simplify() const
         case ATAN2:
         case MOD:
         case POW:
+        {
             Expression * v2 = args[1]->simplify();
 
             if (freecad_dynamic_cast<NumberExpression>(v2)) {
@@ -1068,6 +1075,9 @@ Expression *FunctionExpression::simplify() const
                 return new FunctionExpression(owner, f, a);
             }
         }
+        default:
+            break;
+        }
         delete v1;
         return eval();
     }