diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
index b280f42ac3..208ee8b86e 100644
--- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
@@ -456,8 +456,8 @@ BPlusTree::SetTo(Inode* stream)
 	// is header valid?
 
 	if (fHeader->MaximumSize() != stream->Size()) {
-		FATAL(("B+tree header size %Ld doesn't fit file size %Ld!\n",
-			fHeader->MaximumSize(), stream->Size()));
+		dprintf("B+tree header size %Ld doesn't fit file size %Ld!\n",
+			fHeader->MaximumSize(), stream->Size());
 		// we can't change the header since we don't have a transaction
 		//fHeader->maximum_size = HOST_ENDIAN_TO_BFS_INT64(stream->Size());
 	}
diff --git a/src/add-ons/kernel/file_systems/bfs/Debug.cpp b/src/add-ons/kernel/file_systems/bfs/Debug.cpp
index 373f1a7bca..25e9b03e1a 100644
--- a/src/add-ons/kernel/file_systems/bfs/Debug.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Debug.cpp
@@ -365,7 +365,7 @@ dump_block_run_array(int argc, char** argv)
 		return 0;
 	}
 
-	block_run* runs = (block_run*)parse_expression(argv[1]);
+	const block_run* runs = (const block_run*)parse_expression(argv[1]);
 	uint32 count = 16;
 	if (argc > 2)
 		count = parse_expression(argv[2]);
@@ -427,6 +427,7 @@ remove_debugger_commands()
 	remove_debugger_command("bfs_btree_header", dump_bplustree_header);
 	remove_debugger_command("bfs_btree_node", dump_bplustree_node);
 	remove_debugger_command("bfs", dump_volume);
+	remove_debugger_command("bfs_block_runs", dump_block_run_array);
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/bfs/Debug.h b/src/add-ons/kernel/file_systems/bfs/Debug.h
index db73d2a470..dfe2f4a103 100644
--- a/src/add-ons/kernel/file_systems/bfs/Debug.h
+++ b/src/add-ons/kernel/file_systems/bfs/Debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2001-2008, Axel Dörfler, axeld@pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 #ifndef DEBUG_H
@@ -67,7 +67,7 @@
 	#define REPORT_ERROR(status) \
 		__out("bfs: %s:%d: %s\n", __FUNCTION__, __LINE__, strerror(status));
 	#define RETURN_ERROR(err) { status_t _status = err; if (_status < B_OK) REPORT_ERROR(_status); return _status;}
-//	#define FATAL(x) { __out("bfs: "); __out x; sync(); panic("BFS!\n"); }
+//	#define FATAL(x) { panic x; }
 	#define FATAL(x) { __out("bfs: "); __out x; }
 	#define INFORM(x) { __out("bfs: "); __out x; }
 	#define FUNCTION() ;
@@ -88,9 +88,9 @@
 	struct disk_super_block;
 	class Inode;
 	class Volume;
-	
+
 	// some structure dump functions
-	extern void dump_block_run(const char *prefix, block_run &run);
+	extern void dump_block_run(const char *prefix, const block_run &run);
 	extern void dump_super_block(const disk_super_block *superBlock);
 	extern void dump_data_stream(const data_stream *stream);
 	extern void dump_inode(const bfs_inode *inode);