diff --git a/firmware/hal_keyboard.c b/firmware/hal_keyboard.c
index 4ba48de..380d2c6 100644
--- a/firmware/hal_keyboard.c
+++ b/firmware/hal_keyboard.c
@@ -750,7 +750,7 @@ void varsKeyHandler(BINT keymsg,BINT menunum,BINT varnum)
                     if(ISIDENT(*action)) {
                         // JUST EVAL THE VARIABLE
                         rplPushData(action);    // PUSH THE NAME ON THE STACK
-                        Opcode=(CMD_OVR_EVAL);
+                        Opcode=(CMD_OVR_EVAL1);
                         break;
                     }
                     if(ISUNIT(*action)) {
diff --git a/newrpl-fw.pro b/newrpl-fw.pro
index 704a664..e9bf079 100644
--- a/newrpl-fw.pro
+++ b/newrpl-fw.pro
@@ -159,7 +159,7 @@ RPL_OBJECTS =   newrpl/rpl-objects/lib-54.nrpl \
 
 
 # This might need to be adapted to each cross-compiler installation
-GCC_LIBDIR = /usr/local/lib/gcc/arm-none-eabi/5.2.0
+GCC_LIBDIR = /usr/lib/gcc/arm-none-eabi/4.8.2
 
 INCLUDEPATH += $$GCC_LIBDIR/include
 QMAKE_LIBDIR += $$GCC_LIBDIR
@@ -197,7 +197,7 @@ QMAKE_LFLAGS_SHAPP =
 QMAKE_LFLAGS_THREAD =
 QMAKE_LFLAGS = -T$$PWD/firmware/ld.script -nodefaultlibs -nostdlib -L$$GCC_LIBDIR
 
-QMAKE_POST_LINK = $$PWD/firmware/elf2rom $(TARGET)
+QMAKE_POST_LINK = $$PWD/tools-bin/elf2rom $(TARGET)
 
 
 ## Additional RPL compiler, make sure it's in the PATH