diff --git a/Repetier Firmware/Repetier/Printer.cpp b/Repetier Firmware/Repetier/Printer.cpp
index 53e413c..fcc907c 100644
--- a/Repetier Firmware/Repetier/Printer.cpp	
+++ b/Repetier Firmware/Repetier/Printer.cpp	
@@ -859,9 +859,12 @@ void Printer::setup()
     Extruder::initExtruder();
     // sets autoleveling in eeprom init
     EEPROM::init(); // Read settings from eeprom if wanted
-    for(uint8_t i = 0; i < E_AXIS_ARRAY; i++)
+    for(uint8_t i = 0; i < sizeof(currentPositionSteps)/sizeof(currentPositionSteps[0]); i++)
     {
         currentPositionSteps[i] = 0;
+    }
+    for(uint8_t i = 0; i < sizeof(currentPosition)/sizeof(currentPosition[0]); i++)
+    {
         currentPosition[i] = 0.0;
     }
 //setAutolevelActive(false); // fixme delete me
diff --git a/Repetier Firmware/Repetier/uilang.h b/Repetier Firmware/Repetier/uilang.h
index fdac082..7d87ed1 100644
--- a/Repetier Firmware/Repetier/uilang.h	
+++ b/Repetier Firmware/Repetier/uilang.h	
@@ -16,6 +16,12 @@
 
 */
 
+#ifndef UI_LANG_H
+#define UI_LANG_H
+
+// Include Configuration.h in order to load the correct language.
+#include "Configuration.h"
+
 #if !defined(UI_DISPLAY_CHARSET) || UI_DISPLAY_CHARSET>3
 #define UI_DISPLAY_CHARSET 1
 #endif
@@ -1798,3 +1804,5 @@
 #define UI_TEXT_CALIBRATING_BED       "Calibrating","Bed Level Matrix","","Please Wait"
 
 #endif
+
+#endif