diff --git a/mspflasher/mspflasher/Makefile b/mspflasher/mspflasher/Makefile
index 2289de2..a548b5f 100644
--- a/mspflasher/mspflasher/Makefile
+++ b/mspflasher/mspflasher/Makefile
@@ -1,9 +1,9 @@
-CC=g++
-CFLAGS=-std=c++0x -I./Inc -m32
-LDFLAGS=-L../ -lmsp430
+CC=arm-linux-gnueabihf-g++
+CFLAGS=-std=c++0x -I./Inc
+LDFLAGS=-L../libmsp430/ -lmsp430
 SOURCES=MSP430_Flasher.cpp Support.cpp StdUseCase.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
-EXECUTABLE=../MSP430Flasher
+EXECUTABLE=./MSP430Flasher
 
 all: $(SOURCES) $(EXECUTABLE)
 	
@@ -15,4 +15,4 @@ $(EXECUTABLE): $(OBJECTS)
 
 clean:
 	rm -rf *.o
-	rm -rf ../MSP430Flasher
+	rm -rf ./MSP430Flasher
diff --git a/mspflasher/mspflasher/StdUseCase.cpp b/mspflasher/mspflasher/StdUseCase.cpp
index 81fca35..c460e6f 100644
--- a/mspflasher/mspflasher/StdUseCase.cpp
+++ b/mspflasher/mspflasher/StdUseCase.cpp
@@ -388,6 +388,10 @@ void StdUseCase_InterfaceInit(sDefOptions_t* sOpt)
         StdUseCase_Exit(EXIT_INITIALIZE, 0);
     }
 
+    // load device database
+    MSP430_LoadDeviceDb(NULL);
+    Print_N_Log(STD_MSG,"* Loaded device database.\n");
+
     // set interface speed
     if(sOpt->pcFETspeed != NULL)
     {
diff --git a/mspflasher/mspflasher/Support.cpp b/mspflasher/mspflasher/Support.cpp
index a48544b..45ee150 100644
--- a/mspflasher/mspflasher/Support.cpp
+++ b/mspflasher/mspflasher/Support.cpp
@@ -304,7 +304,7 @@ int EvaluateOptions(int argc, char* argv[], sDefOptions_t* sOpt, sRTE_t* RTE)
 	}
 
     // get parameter
-    while ((cOpt = getopt(argc, ( char**)argv, g_cAllOpts, RTE)) != EOF )
+    while ((cOpt = getopt(argc, ( char**)argv, g_cAllOpts, RTE)) != (char)EOF )
     {
         // choose code for determined parameter
         switch (cOpt)
@@ -761,7 +761,7 @@ int EvaluateOptions(int argc, char* argv[], sDefOptions_t* sOpt, sRTE_t* RTE)
     }
 
     // get additional use case specific parameters
-    while ((cOpt = getopt(argc, ( char**)argv, g_cAllOpts, RTE)) != EOF )
+    while ((cOpt = getopt(argc, ( char**)argv, g_cAllOpts, RTE)) != (char)EOF )
     {
         for(i = 0; i < g_lCountOpt; i++)                        // for every element of struct of additional parameters
         {