diff --git a/Makefile.include b/Makefile.include
index a5c850024bafee17e9fac918aa6b470a38c17c55..6aa42d5b5e8163e1ab5706ec99d9a707e6ccad1f 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -4,8 +4,8 @@ CFLAGS += -DBOARD=$(BB)
 export CFLAGS
 
 # mandatory include! 
-include $(RIOTBASE)/Makefile.modules 
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
+include $(RIOTBASE)/Makefile.modules 
 
 # your binaries to link
 BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
@@ -36,7 +36,7 @@ clean:
 	rm -f $(PROJBINDIR)/*
 
 flash: all
-	$(FLASH) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
+	$(FLASHER) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
 
 term:
 	$(TERM) $(PORT)
diff --git a/cpu/arm_common/Makefile b/cpu/arm_common/Makefile
index 46db97e247a38837ed087cffcc839757eb5bd438..23949ac078da3652ecbd4a9bd15e71c59203e826 100644
--- a/cpu/arm_common/Makefile
+++ b/cpu/arm_common/Makefile
@@ -3,5 +3,3 @@ INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include
 
 include $(RIOTBASE)/Makefile.base
 
-
-
diff --git a/cpu/arm_common/arm_cpu.c b/cpu/arm_common/arm_cpu.c
index a5ffb50f45b1a57cfbdda4ac5d81a31e7fbc0273..997005bfc8aee8ffc3e8ec2bdd15175f6747b6a5 100644
--- a/cpu/arm_common/arm_cpu.c
+++ b/cpu/arm_common/arm_cpu.c
@@ -33,10 +33,10 @@ void thread_yield() {
 // Processor specific routine - here for ARM7
 // sizeof(void*) = sizeof(int)
 //----------------------------------------------------------------------------
-char * thread_stack_init(void * task_func, void * stack_start)
+char * thread_stack_init(void * task_func, void * stack_start, int stack_size)
 {
    unsigned int * stk;
-   stk = (unsigned int *) stack_start;
+   stk = (unsigned int *) stack_start + stack_size;
     stk--;
 
     *stk = 0x77777777;
diff --git a/cpu/msp430-common/cpu.c b/cpu/msp430-common/cpu.c
index c7288cb94a185bd15314f4b317dde3edb3b92104..c3be41ec58d533af3f19a3966115349ce6ac189a 100644
--- a/cpu/msp430-common/cpu.c
+++ b/cpu/msp430-common/cpu.c
@@ -97,10 +97,10 @@ void cpu_switch_context_exit(void){
 //----------------------------------------------------------------------------
 // Processor specific routine - here for MSP
 //----------------------------------------------------------------------------
-char *thread_stack_init(void *task_func, void *stack_start)
+char *thread_stack_init(void *task_func, void *stack_start, int stack_size)
 {
     unsigned short * stk;
-    stk = (unsigned short *) stack_start;
+    stk = (unsigned short *) stack_start + stack_size;
 
     *stk = (unsigned short) sched_task_exit;
     --stk;