diff --git a/tests/config.h b/tests/config.h
index 73a4bb4da..5898d12eb 100644
--- a/tests/config.h
+++ b/tests/config.h
@@ -15,8 +15,8 @@
 #define uart_init uart1_init
 
 /* nvm-read */
-#define READ_ADDR 0x1F000
-#define READ_NBYTES 1024
+#define READ_ADDR 0x1E000
+#define READ_NBYTES 8
 
 /* nvm-write */
 #define WRITE_NBYTES 8
diff --git a/tools/ftditools/bbmc.c b/tools/ftditools/bbmc.c
index 4388b2a66..baa871280 100644
--- a/tools/ftditools/bbmc.c
+++ b/tools/ftditools/bbmc.c
@@ -64,11 +64,11 @@ void usage(void);
 	
 static struct layout layouts[] =
 {
-	{ .name = "redbee_econotag",
+	{ .name = "redbee-econotag",
 	  .desc = "Redbee Econotag",
 	  std_layout(REDBEE_ECONOTAG)
 	},
-	{ .name = "redbee_usb",
+	{ .name = "redbee-usb",
 	  .desc = "Redbee USB stick",
 	  std_layout(REDBEE_USB)
 	},