diff --git a/conf/autopilot/booz2_simulator.makefile b/conf/autopilot/booz2_simulator.makefile
index 1b0884fdc8..17c959965d 100644
--- a/conf/autopilot/booz2_simulator.makefile
+++ b/conf/autopilot/booz2_simulator.makefile
@@ -45,7 +45,7 @@ sim.srcs = $(SIMDIR)/booz2_sim_main.c                \
            $(SIMDIR)/booz_sensors_model_gps.c        \
            $(SIMDIR)/booz_wind_model.c               \
 
-sim.CFLAGS += -DBOARD_CONFIG=\"booz2_board_v1_0.h\"
+sim.CFLAGS += -DBOARD_CONFIG=\"boards/booz2_v1_0.h\"
 
 sim.srcs   += $(SRC_BOOZ_SIM)/booz2_unsimulated_peripherals.c
 sim.srcs   += $(SRC_BOOZ)/booz2_main.c
diff --git a/conf/autopilot/booz2_simulator_nps.makefile b/conf/autopilot/booz2_simulator_nps.makefile
index 5c8541adec..1806798d8c 100644
--- a/conf/autopilot/booz2_simulator_nps.makefile
+++ b/conf/autopilot/booz2_simulator_nps.makefile
@@ -48,7 +48,7 @@ sim.srcs += math/pprz_trig_int.c             \
 
 
 
-sim.CFLAGS += -DBOARD_CONFIG=\"booz2_board_v1_0.h\"
+sim.CFLAGS += -DBOARD_CONFIG=\"boards/booz2_v1_0.h\"
 
 sim.srcs   += $(SRC_BOOZ_SIM)/booz2_unsimulated_peripherals.c
 sim.srcs   += $(SRC_BOOZ)/booz2_main.c
diff --git a/sw/airborne/booz/arch/sim/actuators_buss_twi_blmc_hw.h b/sw/airborne/booz/arch/sim/actuators_buss_twi_blmc_hw.h
index dc1b68ef95..47c0a8f10e 100644
--- a/sw/airborne/booz/arch/sim/actuators_buss_twi_blmc_hw.h
+++ b/sw/airborne/booz/arch/sim/actuators_buss_twi_blmc_hw.h
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
  *
  * This file is part of paparazzi.
@@ -18,14 +18,14 @@
  * You should have received a copy of the GNU General Public License
  * along with paparazzi; see the file COPYING.  If not, write to
  * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef ACTUATORS_BUSS_TWI_BLMC_HW_H
 #define ACTUATORS_BUSS_TWI_BLMC_HW_H
 
 #include "airframe.h"
-#include "booz2_supervision.h"
+#include "actuators/booz_supervision.h"
 
 #define BUSS_TWI_BLMC_NB 4
 extern uint8_t buss_twi_blmc_motor_power[BUSS_TWI_BLMC_NB];
diff --git a/sw/simulator/nps/nps_main.c b/sw/simulator/nps/nps_main.c
index c5b19fd436..f0a87c00c2 100644
--- a/sw/simulator/nps/nps_main.c
+++ b/sw/simulator/nps/nps_main.c
@@ -131,7 +131,7 @@ static gboolean nps_main_periodic(gpointer data __attribute__ ((unused))) {
 	/* unscale to initial real time*/
 	irt = t1 - (t1 - nps_main.scaled_initial_time)*nps_main.host_time_factor;
 
-    printf("Press <enter> to continue (or CTRL-Z to suspend). Enter a new time factor if needed: ");
+    printf("Press <enter> to continue (or CTRL-Z to suspend).\nEnter a new time factor if needed (current: %f): ", nps_main.host_time_factor);
 	fflush(stdout);
 	fgets(line,127,stdin);
 	if ((sscanf(line," %le ", &tf) == 1)) {