diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp
index c14ab7934..bec189d1b 100644
--- a/Firmware/lcd.cpp
+++ b/Firmware/lcd.cpp
@@ -633,8 +633,7 @@ void lcd_printNumber(unsigned long n, uint8_t base)
 
 uint8_t lcd_draw_update = 2;
 int16_t lcd_encoder = 0;
-uint8_t lcd_encoder_bits = 0;
-int8_t lcd_encoder_diff = 0;
+static int8_t lcd_encoder_diff = 0;
 
 uint8_t lcd_buttons = 0;
 uint8_t lcd_update_enabled = 1;
diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp
index 81b4b10ff..120471e96 100755
--- a/Firmware/menu.cpp
+++ b/Firmware/menu.cpp
@@ -45,7 +45,7 @@ void menu_data_reset(void)
 	memset(&menu_data, 0, sizeof(menu_data));
 }
 
-void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state)
+void menu_goto(menu_func_t menu, const int16_t encoder, bool reset_menu_state, const bool feedback)
 {
 	CRITICAL_SECTION_START;
 	if (menu_menu != menu)
diff --git a/Firmware/menu.h b/Firmware/menu.h
index 5a0528c1c..c3cf80924 100755
--- a/Firmware/menu.h
+++ b/Firmware/menu.h
@@ -65,7 +65,7 @@ extern menu_func_t menu_menu;
 
 extern void menu_data_reset(void);
 
-extern void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state);
+extern void menu_goto(menu_func_t menu, const int16_t encoder, bool reset_menu_state, const bool feedback=false);
 
 #define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0;
 void menu_start(void);
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 8fb49f464..43dc3aa8a 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2825,7 +2825,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z)
                 _delay(50);
                 if (! planner_queue_full()) {
                     // Only move up, whatever direction the user rotates the encoder.
-                    current_position[Z_AXIS] += lcd_encoder;
+                    current_position[Z_AXIS] += abs(lcd_encoder);
                     lcd_encoder = 0;
                     plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60);
                 }