diff --git a/gcode.c b/gcode.c
index 2ae6d50..c20c3a2 100644
--- a/gcode.c
+++ b/gcode.c
@@ -2373,16 +2373,27 @@ status_code_t gc_execute_block (char *block)
             
 #if ENABLE_ACCELERATION_PROFILES
         case NonModal_SetAccelerationProfile:
-            if (gc_block.words.e)
+            if (gc_block.words.e) {
                 FAIL(Status_GcodeUnsupportedCommand);
-            else if (!gc_block.words.p)
-                gc_block.values.p = 1.0f;
-            else if (gc_block.values.p < 1.0f)
-                FAIL(Status_NegativeValue);
-            else if (gc_block.values.p > 5.0f)
-                FAIL(Status_GcodeValueOutOfRange);
-            else
+                break;
+                }
+            else if (!gc_block.words.p) {
+                gc_block.values.p = 1.0f; 
                 gc_state.modal.acceleration_profile = gc_block.values.p;
+                gc_block.words.p = Off;
+                break;
+                }
+            else if (gc_block.values.p < 1.0f) {
+                FAIL(Status_NegativeValue); 
+                break;
+                }
+            else if (gc_block.values.p > 5.0f) {
+                FAIL(Status_GcodeValueOutOfRange); 
+                break;
+                }
+            else 
+            gc_state.modal.acceleration_profile = gc_block.values.p;
+            gc_block.words.p = Off;
             break;
 #endif
         default:
diff --git a/planner.c b/planner.c
index cfd9318..eb80245 100644
--- a/planner.c
+++ b/planner.c
@@ -339,7 +339,7 @@ inline static float plan_compute_profile_parameters (plan_block_t *block, float
     return nominal_speed;
 }
 
-static inline float limit_acceleration_by_axis_maximum (float *unit_vec,)
+static inline float limit_acceleration_by_axis_maximum (float *unit_vec)
 {
     uint_fast8_t idx = N_AXIS;
     float limit_value = SOME_LARGE_VALUE;
diff --git a/settings.h b/settings.h
index 23ef883..471d857 100644
--- a/settings.h
+++ b/settings.h
@@ -712,9 +712,7 @@ typedef struct {
     float dual_axis_offset;
     float homing_seek_rate;
     float homing_feed_rate;
-#if ENABLE_JERK_ACCELERATION 
     float jerk;
-#endif
 #if ENABLE_BACKLASH_COMPENSATION
     float backlash;
 #endif