diff --git a/projects/default/Jamfile b/projects/default/Jamfile
index bdbee91b66..70d0ae1ce8 100644
--- a/projects/default/Jamfile
+++ b/projects/default/Jamfile
@@ -6,6 +6,15 @@
 
 SubDir TOP projects default ;
 
-Module default_project : main.c : shell posix_io uart0 shell_commands ps rtc sht11 ltc4150 cc110x_ng transceiver gpioint auto_init config mci ;
+switch $(BOARD) {
+    case "msb-430h" : 
+        Module default_project : main.c : shell posix_io uart0 shell_commands ps sht11 cc110x_ng transceiver auto_init ;
+    case "msba2" :
+        Module default_project : main.c : shell posix_io uart0 shell_commands ps rtc sht11 ltc4150 cc110x_ng transceiver gpioint auto_init config mci ;
+    case "msb-430" :
+        Module default_project : main.c : shell posix_io uart0 shell_commands ps sht11 auto_init ;
+    case "*" :
+        exit "Board not supported for this project" ;
+}
 
 UseModule default_project ;
diff --git a/projects/default/main.c b/projects/default/main.c
index 6c16721e90..1a5fea9261 100644
--- a/projects/default/main.c
+++ b/projects/default/main.c
@@ -25,9 +25,13 @@ static void shell_putchar(int c) {
 int main(void) {
     shell_t shell;
     (void) posix_open(uart0_handler_pid, 0);
-	ltc4150_start();
+#ifdef MODULE_LTC4150
+    ltc4150_start();
+#endif
+#ifdef MODULE_TRANSCEIVER
     transceiver_init(TRANSCEIVER_CC1100);
     (void) transceiver_start();
+#endif
     
     (void) puts("Welcome to ukleos!");
 
diff --git a/sys/transceiver.c b/sys/transceiver.c
index 5d470d5bb4..f3c2291351 100644
--- a/sys/transceiver.c
+++ b/sys/transceiver.c
@@ -340,7 +340,9 @@ void receive_cc1100_packet(radio_packet_t *trans_p) {
  */
 static uint8_t send_packet(transceiver_type_t t, void *pkt) {
     uint8_t res = 0;
+#ifdef MODULE_CC110x
     int snd_ret;
+#endif
     radio_packet_t p = *((radio_packet_t*) pkt);
     
 #ifdef MODULE_CC110X_NG
@@ -358,7 +360,7 @@ static uint8_t send_packet(transceiver_type_t t, void *pkt) {
 #else
             memcpy(cc1100_pkt, p.data, p.length);
             if ((snd_ret = cc1100_send_csmaca(p.dst, 4, 0, (char*) cc1100_pkt, p.length)) < 0) {
-                //printf("snd_ret (%u) = %i\n", p.length, snd_ret);
+                DEBUG("snd_ret (%u) = %i\n", p.length, snd_ret);
                 res = 0;
             }
             else {