Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ kernel/generic/include/macros.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -84,6 +84,6 @@
 #define STRING_ARG(arg)  #arg
 
-#define LOWER32(arg)  ((arg) & 0xffffffff)
-#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
+#define LOWER32(arg)  (((uint64_t) (arg)) & 0xffffffff)
+#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & 0xffffffff)
 
 #define MERGE_LOUP32(lo, up) \
Index: uspace/app/bdsh/cmds/builtins/builtins.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/builtins.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/bdsh/cmds/builtins/builtins.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -10,5 +10,5 @@
 #include "cd/cd_def.h"
 #include "exit/exit_def.h"
-	{NULL, NULL, NULL, NULL}
+	{NULL, NULL, NULL, NULL, NULL}
 };
 
Index: uspace/app/bdsh/cmds/builtins/cd/cd_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -4,3 +4,4 @@
 	&cmd_cd,
 	&help_cmd_cd,
+	0
 },
Index: uspace/app/bdsh/cmds/builtins/exit/exit_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -4,3 +4,4 @@
 	&cmd_exit,
 	&help_cmd_exit,
+	0
 },
Index: uspace/app/bdsh/input.c
===================================================================
--- uspace/app/bdsh/input.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/bdsh/input.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -508,5 +508,4 @@
 {
 	int sa, sb;
-	wchar_t tmp_c;
 	char *str;
 
@@ -514,13 +513,11 @@
 
 	if (sb < ti->nc) {
-		tmp_c = ti->buffer[sb];
+		wchar_t tmp_c = ti->buffer[sb];
 		ti->buffer[sb] = '\0';
-	}
-
-	str = wstr_to_astr(ti->buffer + sa);
-
-	if (sb < ti->nc)
+		str = wstr_to_astr(ti->buffer + sa);
 		ti->buffer[sb] = tmp_c;
-
+	} else
+		str = wstr_to_astr(ti->buffer + sa);
+	
 	if (str == NULL)
 		goto error;
Index: uspace/app/edit/edit.c
===================================================================
--- uspace/app/edit/edit.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/edit/edit.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -718,5 +718,5 @@
 	wchar_t c;
 	size_t pos, size;
-	unsigned s_column;
+	int s_column;
 	coord_t csel_start, csel_end, ctmp;
 
@@ -766,5 +766,5 @@
 		s_column = pane.sh_column;
 		while (pos < size) {
-			if (csel_start.row == rbc.row && csel_start.column == s_column) {
+			if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) {
 				fflush(stdout);
 				console_set_color(con, COLOR_BLACK, COLOR_RED, 0);
@@ -772,5 +772,5 @@
 			}
 	
-			if (csel_end.row == rbc.row && csel_end.column == s_column) {
+			if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
 				fflush(stdout);
 				console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
@@ -792,5 +792,5 @@
 		}
 
-		if (csel_end.row == rbc.row && csel_end.column == s_column) {
+		if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
 			fflush(stdout);
 			console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
Index: uspace/app/mkfat/fat.h
===================================================================
--- uspace/app/mkfat/fat.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/mkfat/fat.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -78,5 +78,5 @@
 			uint16_t	signature;
 		} __attribute__ ((packed));
-		struct fat32 {
+		struct {
 			/* FAT32 only */
 			/** Sectors per FAT. */
@@ -108,5 +108,5 @@
 			/** Signature. */
 			uint16_t	signature;
-		} __attribute__ ((packed));
+		} fat32 __attribute__ ((packed));
 	};
 } __attribute__ ((packed)) fat_bs_t;
Index: uspace/app/redir/redir.c
===================================================================
--- uspace/app/redir/redir.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/redir/redir.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -72,5 +72,5 @@
 static task_id_t spawn(int argc, char *argv[])
 {
-	char **args = (char *) calloc(argc + 1, sizeof(char *));
+	char **args = (char **) calloc(argc + 1, sizeof(char *));
 	if (!args) {
 		printf("No memory available\n");
Index: uspace/app/taskdump/taskdump.c
===================================================================
--- uspace/app/taskdump/taskdump.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/taskdump/taskdump.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -356,5 +356,5 @@
 }
 
-static int area_dump(as_area_info_t *area)
+static __attribute__((unused)) int area_dump(as_area_info_t *area)
 {
 	size_t to_copy;
Index: uspace/app/tester/fault/fault2.c
===================================================================
--- uspace/app/tester/fault/fault2.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/app/tester/fault/fault2.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -30,4 +30,6 @@
 #include "../tester.h"
 
+typedef int __attribute__((may_alias)) aliasing_int;
+
 char *test_fault2(void)
 {
@@ -35,5 +37,5 @@
 	volatile int var1;
 	
-	var1 = *((int *) (((char *) (&var)) + 1));
+	var1 = *((aliasing_int *) (((char *) (&var)) + 1));
 	
 	return "Survived unaligned read";
Index: uspace/lib/libc/arch/ia64/include/ddi.h
===================================================================
--- uspace/lib/libc/arch/ia64/include/ddi.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/arch/ia64/include/ddi.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -39,5 +39,5 @@
 #include <libarch/types.h>
 
-#define IO_SPACE_BOUNDARY	(64 * 1024)
+#define IO_SPACE_BOUNDARY	((void *) (64 * 1024))
 
 uint64_t get_ia64_iospace_address(void);
Index: uspace/lib/libc/arch/sparc64/include/ddi.h
===================================================================
--- uspace/lib/libc/arch/sparc64/include/ddi.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/arch/sparc64/include/ddi.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -37,7 +37,10 @@
 #include <libarch/types.h>
 
-static inline memory_barrier(void)
+static inline void memory_barrier(void)
 {
-	asm volatile ("membar #LoadLoad | #StoreStore\n" ::: "memory");
+	asm volatile (
+		"membar #LoadLoad | #StoreStore\n"
+		::: "memory"
+	);
 }
 
Index: uspace/lib/libc/arch/sparc64/include/fibril.h
===================================================================
--- uspace/lib/libc/arch/sparc64/include/fibril.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/arch/sparc64/include/fibril.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -48,5 +48,5 @@
 		    STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA); \
 		(c)->fp = -STACK_BIAS; \
-		(c)->tp = ptls; \
+		(c)->tp = (uint64_t) ptls; \
 	} while (0)
 	
Index: uspace/lib/libc/generic/clipboard.c
===================================================================
--- uspace/lib/libc/generic/clipboard.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/generic/clipboard.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -148,5 +148,5 @@
 			aid_t req = async_send_1(clip_phone, CLIPBOARD_GET_DATA, tag, NULL);
 			rc = async_data_read_start(clip_phone, (void *) sbuf, size);
-			if (rc == EOVERFLOW) {
+			if ((int) rc == EOVERFLOW) {
 				/*
 				 * The data in the clipboard has changed since
Index: uspace/lib/libc/generic/fibril.c
===================================================================
--- uspace/lib/libc/generic/fibril.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/generic/fibril.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -41,4 +41,5 @@
 #include <unistd.h>
 #include <stdio.h>
+#include <arch/barrier.h>
 #include <libarch/faddr.h>
 #include <futex.h>
@@ -133,26 +134,27 @@
 int fibril_switch(fibril_switch_type_t stype)
 {
-	fibril_t *srcf, *dstf;
 	int retval = 0;
 	
 	futex_down(&fibril_futex);
-
+	
 	if (stype == FIBRIL_PREEMPT && list_empty(&ready_list))
 		goto ret_0;
-
+	
 	if (stype == FIBRIL_FROM_MANAGER) {
-		if (list_empty(&ready_list) && list_empty(&serialized_list))
+		if ((list_empty(&ready_list)) && (list_empty(&serialized_list)))
 			goto ret_0;
+		
 		/*
 		 * Do not preempt if there is not enough threads to run the
 		 * ready fibrils which are not serialized.
 		 */
-		if (list_empty(&serialized_list) &&
-		    threads_in_manager <= serialized_threads) {
+		if ((list_empty(&serialized_list)) &&
+		    (threads_in_manager <= serialized_threads)) {
 			goto ret_0;
 		}
 	}
+	
 	/* If we are going to manager and none exists, create it */
-	if (stype == FIBRIL_TO_MANAGER || stype == FIBRIL_FROM_DEAD) {
+	if ((stype == FIBRIL_TO_MANAGER) || (stype == FIBRIL_FROM_DEAD)) {
 		while (list_empty(&manager_list)) {
 			futex_up(&fibril_futex);
@@ -162,10 +164,12 @@
 	}
 	
-	srcf = __tcb_get()->fibril_data;
+	fibril_t *srcf = __tcb_get()->fibril_data;
 	if (stype != FIBRIL_FROM_DEAD) {
+		
 		/* Save current state */
 		if (!context_save(&srcf->ctx)) {
 			if (serialization_count)
 				srcf->flags &= ~FIBRIL_SERIALIZED;
+			
 			if (srcf->clean_after_me) {
 				/*
@@ -173,5 +177,5 @@
 				 * restored context here.
 				 */
-				void *stack = srcf->clean_after_me->stack; 
+				void *stack = srcf->clean_after_me->stack;
 				if (stack) {
 					/*
@@ -188,7 +192,8 @@
 				srcf->clean_after_me = NULL;
 			}
+			
 			return 1;	/* futex_up already done here */
 		}
-
+		
 		/* Save myself to the correct run list */
 		if (stype == FIBRIL_PREEMPT)
@@ -197,5 +202,5 @@
 			list_append(&srcf->link, &manager_list);
 			threads_in_manager--;
-		} else {	
+		} else {
 			/*
 			 * If stype == FIBRIL_TO_MANAGER, don't put ourselves to
@@ -206,6 +211,10 @@
 	}
 	
+	/* Avoid srcf being clobbered by context_save() */
+	srcf = __tcb_get()->fibril_data;
+	
 	/* Choose a new fibril to run */
-	if (stype == FIBRIL_TO_MANAGER || stype == FIBRIL_FROM_DEAD) {
+	fibril_t *dstf;
+	if ((stype == FIBRIL_TO_MANAGER) || (stype == FIBRIL_FROM_DEAD)) {
 		dstf = list_get_instance(manager_list.next, fibril_t, link);
 		if (serialization_count && stype == FIBRIL_TO_MANAGER) {
@@ -214,5 +223,5 @@
 		}
 		threads_in_manager++;
-
+		
 		if (stype == FIBRIL_FROM_DEAD) 
 			dstf->clean_after_me = srcf;
@@ -228,9 +237,9 @@
 	}
 	list_remove(&dstf->link);
-
+	
 	futex_up(&fibril_futex);
 	context_restore(&dstf->ctx);
 	/* not reached */
-
+	
 ret_0:
 	futex_up(&fibril_futex);
Index: uspace/lib/libc/generic/ipc.c
===================================================================
--- uspace/lib/libc/generic/ipc.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/generic/ipc.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -728,10 +728,11 @@
     int *flags)
 {
-	int res;
-	sysarg_t tmp_flags;
-	res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
+	sysarg_t tmp_flags = 0;
+	int res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
 	    (ipcarg_t) size, arg, NULL, &tmp_flags);
+	
 	if (flags)
 		*flags = tmp_flags;
+	
 	return res;
 }
Index: uspace/lib/libc/include/macros.h
===================================================================
--- uspace/lib/libc/include/macros.h	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/lib/libc/include/macros.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -48,6 +48,6 @@
 #define STRING_ARG(arg)  #arg
 
-#define LOWER32(arg)  ((arg) & 0xffffffff)
-#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
+#define LOWER32(arg)  (((uint64_t) (arg)) & 0xffffffff)
+#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & 0xffffffff)
 
 #define MERGE_LOUP32(lo, up) \
Index: uspace/srv/bd/ata_bd/ata_bd.c
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/bd/ata_bd/ata_bd.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -500,5 +500,7 @@
 
 	d = &disk[disk_id];
-	bc.h = 0;	/* Silence warning. */
+	
+	/* Silence warning. */
+	memset(&bc, 0, sizeof(bc));
 
 	/* Compute block coordinates. */
@@ -574,5 +576,7 @@
 
 	d = &disk[disk_id];
-	bc.h = 0;	/* Silence warning. */
+	
+	/* Silence warning. */
+	memset(&bc, 0, sizeof(bc));
 
 	/* Compute block coordinates. */
Index: uspace/srv/hid/console/gcons.c
===================================================================
--- uspace/srv/hid/console/gcons.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/console/gcons.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -448,17 +448,17 @@
 	
 	int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
-	    (int) &_binary_gfx_anim_1_ppm_size);
+	    (size_t) &_binary_gfx_anim_1_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 	
 	pm = make_pixmap(_binary_gfx_anim_2_ppm_start,
-	    (int) &_binary_gfx_anim_2_ppm_size);
+	    (size_t) &_binary_gfx_anim_2_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 	
 	pm = make_pixmap(_binary_gfx_anim_3_ppm_start,
-	    (int) &_binary_gfx_anim_3_ppm_size);
+	    (size_t) &_binary_gfx_anim_3_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 	
 	pm = make_pixmap(_binary_gfx_anim_4_ppm_start,
-	    (int) &_binary_gfx_anim_4_ppm_size);
+	    (size_t) &_binary_gfx_anim_4_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 	
Index: uspace/srv/hid/fb/serial_console.c
===================================================================
--- uspace/srv/hid/fb/serial_console.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/fb/serial_console.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -57,6 +57,6 @@
 void serial_putchar(wchar_t ch);
 
-static int scr_width;
-static int scr_height;
+static unsigned int scr_width;
+static unsigned int scr_height;
 static bool color = true;	/** True if producing color output. */
 static bool utf8 = false;	/** True if producing UTF8 output. */
@@ -108,5 +108,5 @@
 void serial_putchar(wchar_t ch)
 {
-	uint8_t buf[STR_BOUNDS(1)];
+	char buf[STR_BOUNDS(1)];
 	size_t offs;
 	size_t i;
@@ -294,6 +294,6 @@
 }
 
-int lastcol = 0;
-int lastrow = 0;
+unsigned int lastcol = 0;
+unsigned int lastrow = 0;
 
 /**
@@ -309,5 +309,8 @@
 
 	wchar_t c;
-	int col, row, w, h;
+	unsigned int col;
+	unsigned int row;
+	unsigned int w;
+	unsigned int h;
 	int i;
 
@@ -358,5 +361,5 @@
 				break;
 			}
-			if (col + w > scr_width || row + h > scr_height) {
+			if ((col + w > scr_width) || (row + h > scr_height)) {
 				retval = EINVAL;
 				break;
@@ -424,5 +427,5 @@
 		case FB_SCROLL:
 			i = IPC_GET_ARG1(call);
-			if ((i > scr_height) || (i < -scr_height)) {
+			if ((i > (int) scr_height) || (i < -((int) scr_height))) {
 				retval = EINVAL;
 				break;
Index: uspace/srv/hid/kbd/port/msim.c
===================================================================
--- uspace/srv/hid/kbd/port/msim.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/kbd/port/msim.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -64,5 +64,5 @@
 {
 	async_set_interrupt_received(msim_irq_handler);
-	msim_cmds[0].addr = sysinfo_value("kbd.address.virtual");
+	msim_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
 	ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
 	    0, &msim_kbd);
Index: uspace/srv/hid/kbd/port/ns16550.c
===================================================================
--- uspace/srv/hid/kbd/port/ns16550.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/kbd/port/ns16550.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -107,12 +107,4 @@
 }
 
-void ns16550_port_yield(void)
-{
-}
-
-void ns16550_port_reclaim(void)
-{
-}
-
 static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
Index: uspace/srv/hid/kbd/port/sgcn.c
===================================================================
--- uspace/srv/hid/kbd/port/sgcn.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/kbd/port/sgcn.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -92,5 +92,5 @@
 
 /* polling thread */
-static void *sgcn_thread_impl(void *arg);
+static void sgcn_thread_impl(void *arg);
 
 static volatile bool polling_disabled = false;
@@ -167,5 +167,5 @@
  * Thread to poll SGCN for keypresses.
  */
-static void *sgcn_thread_impl(void *arg)
+static void sgcn_thread_impl(void *arg)
 {
 	(void) arg;
Index: uspace/srv/hid/kbd/port/ski.c
===================================================================
--- uspace/srv/hid/kbd/port/ski.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/kbd/port/ski.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -49,5 +49,5 @@
 #define POLL_INTERVAL		10000
 
-static void *ski_thread_impl(void *arg);
+static void ski_thread_impl(void *arg);
 static int32_t ski_getchar(void);
 
@@ -84,5 +84,5 @@
 
 /** Thread to poll Ski for keypresses. */
-static void *ski_thread_impl(void *arg)
+static void ski_thread_impl(void *arg)
 {
 	int32_t c;
Index: uspace/srv/hid/kbd/port/z8530.c
===================================================================
--- uspace/srv/hid/kbd/port/z8530.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hid/kbd/port/z8530.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -96,12 +96,4 @@
 }
 
-void z8530_port_yield(void)
-{
-}
-
-void z8530_port_reclaim(void)
-{
-}
-
 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -55,5 +55,4 @@
 static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall);
 static int cuda_init(void);
-static int cuda_claim(void);
 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/loader/main.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -241,5 +241,5 @@
 		 * Allocate new filv
 		 */
-		fdi_node_t **_filv = (fdi_node_t *) malloc((count + 1) * sizeof(fdi_node_t *));
+		fdi_node_t **_filv = (fdi_node_t **) calloc(count + 1, sizeof(fdi_node_t *));
 		if (_filv == NULL) {
 			free(buf);
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision 3149fc05326068309a4f1f7e327f4c0c15cbd733)
+++ uspace/srv/vfs/vfs.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
@@ -72,7 +72,4 @@
 		ipc_call_t call;
 		ipc_callid_t callid = async_get_call(&call);
-		
-		fs_handle_t fs_handle;
-		int phone;
 		
 		switch (IPC_GET_METHOD(call)) {