Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 210e50a2e64696e25acdb6745a857a8b4862ecdd)
+++ uspace/app/init/init.c	(revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca)
@@ -171,8 +171,8 @@
 {
 	char *argv[3];
-	char hid_in[MAX_DEVICE_NAME];
+	char hid_in[DEVMAP_NAME_MAXLEN];
 	int rc;
 	
-	snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+	snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
 	
 	printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
@@ -196,8 +196,8 @@
 {
 	char *argv[4];
-	char term[MAX_DEVICE_NAME];
+	char term[DEVMAP_NAME_MAXLEN];
 	int rc;
 	
-	snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+	snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
 	
 	printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);
Index: uspace/app/init/init.h
===================================================================
--- uspace/app/init/init.h	(revision 210e50a2e64696e25acdb6745a857a8b4862ecdd)
+++ uspace/app/init/init.h	(revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca)
@@ -39,6 +39,4 @@
 #define NAME  "init"
 
-#define MAX_DEVICE_NAME  32
-
 #endif
 
Index: uspace/lib/libc/generic/vfs/vfs.c
===================================================================
--- uspace/lib/libc/generic/vfs/vfs.c	(revision 210e50a2e64696e25acdb6745a857a8b4862ecdd)
+++ uspace/lib/libc/generic/vfs/vfs.c	(revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca)
@@ -120,9 +120,4 @@
     const char *opts, unsigned int flags)
 {
-	int res;
-	ipcarg_t rc;
-	ipcarg_t rc_orig;
-	aid_t req;
-	dev_handle_t dev_handle;
 	int null_id = -1;
 	char null[DEVMAP_NAME_MAXLEN];
@@ -140,5 +135,6 @@
 	}
 	
-	res = devmap_device_get_handle(fqdn, &dev_handle, flags);
+	dev_handle_t dev_handle;
+	int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
 	if (res != EOK) {
 		if (null_id != -1)
@@ -161,6 +157,7 @@
 	vfs_connect();
 	
-	req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
-	rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+	ipcarg_t rc_orig;
+	aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+	ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
 	if (rc != EOK) {
 		async_wait_for(req, &rc_orig);