Index: kernel/generic/src/main/uinit.c
===================================================================
--- kernel/generic/src/main/uinit.c	(revision bdca26a0f1af74aa02df60e75d1e9a51266872ef)
+++ kernel/generic/src/main/uinit.c	(revision b781cc497418aafed520d245eab50c6954c84dcd)
@@ -70,5 +70,5 @@
 #endif
 
-	uspace_arg_t *uarg = (uspace_arg_t *) arg;
+	uspace_arg_t *uarg = arg;
 	uspace_arg_t local_uarg;
 
@@ -77,6 +77,6 @@
 	local_uarg.uspace_stack_size = uarg->uspace_stack_size;
 	local_uarg.uspace_uarg = uarg->uspace_uarg;
-	local_uarg.uspace_thread_function = NULL;
-	local_uarg.uspace_thread_arg = NULL;
+	local_uarg.uspace_thread_function = USPACE_NULL;
+	local_uarg.uspace_thread_arg = USPACE_NULL;
 
 	free(uarg);