Index: contrib/arch/uspace/srv/console/console.adl
===================================================================
--- contrib/arch/uspace/srv/console/console.adl	(revision 0a1a313fc7edf7be3a41a16a90b8a500d6c98651)
+++ contrib/arch/uspace/srv/console/console.adl	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
@@ -70,5 +70,5 @@
 		!fb.ipc_m_share_out ;
 		[/uspace/lib/libc/fnc.devmap_device_register]* ;
-		!sys_console.sys_disable_console ;
+		!sys_console.sys_debug_disable_console ;
 		[fnc.gcons_redraw_console] ;
 		[fnc.set_rgb_color] ;
Index: contrib/arch/uspace/srv/console/console.bp
===================================================================
--- contrib/arch/uspace/srv/console/console.bp	(revision 0a1a313fc7edf7be3a41a16a90b8a500d6c98651)
+++ contrib/arch/uspace/srv/console/console.bp	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
@@ -59,5 +59,5 @@
 	
 	?kcon_enable {
-		!sys_console.sys_enable_console
+		!sys_console.sys_debug_enable_console
 	} +
 	
Index: contrib/arch/uspace/srv/devmap/devmap_driver.bp
===================================================================
--- contrib/arch/uspace/srv/devmap/devmap_driver.bp	(revision 0a1a313fc7edf7be3a41a16a90b8a500d6c98651)
+++ contrib/arch/uspace/srv/devmap/devmap_driver.bp	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
@@ -9,4 +9,7 @@
 		tentative {
 			?ipc_m_data_write /* device name */
+		} ;
+		tentative {
+			?ipc_m_connect_to_me /* callback */
 		}
 	} +
Index: contrib/arch/uspace/srv/vfs/vfs.bp
===================================================================
--- contrib/arch/uspace/srv/vfs/vfs.bp	(revision 0a1a313fc7edf7be3a41a16a90b8a500d6c98651)
+++ contrib/arch/uspace/srv/vfs/vfs.bp	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
@@ -95,5 +95,5 @@
 					[fnc.vfs_grab_phone] ;
 					!fs.read {
-						!fs.ipc_m_data_read /* forward payload */ ;
+						!fs.ipc_m_data_read /* forward payload */
 					} ;
 					[fnc.vfs_release_phone]
@@ -109,5 +109,5 @@
 					[fnc.vfs_grab_phone] ;
 					!fs.write {
-						!fs.ipc_m_data_write /* forward payload */ ;
+						!fs.ipc_m_data_write /* forward payload */
 					} ;
 					[fnc.vfs_release_phone]
@@ -133,5 +133,5 @@
 					[fnc.vfs_grab_phone] ;
 					!fs.stat {
-						!fs.ipc_m_data_read /* forward struct stat */ ;
+						!fs.ipc_m_data_read /* forward struct stat */
 					} ;
 					[fnc.vfs_release_phone]