Index: uspace/srv/clipboard/clipboard.c
===================================================================
--- uspace/srv/clipboard/clipboard.c	(revision d92c1ca83d148a7c2a672b0288f485c008eae96c)
+++ uspace/srv/clipboard/clipboard.c	(revision a47f52276416c12f15162cebefb4e81101e86a92)
@@ -181,7 +181,7 @@
 	
 	async_set_client_connection(clip_connection);
-	
-	if (service_register(SERVICE_CLIPBOARD) != EOK)
-		return -1;
+	int rc = service_register(SERVICE_CLIPBOARD);
+	if (rc != EOK)
+		return rc;
 	
 	printf("%s: Accepting connections\n", NAME);
Index: uspace/srv/hid/fb/fb.c
===================================================================
--- uspace/srv/hid/fb/fb.c	(revision d92c1ca83d148a7c2a672b0288f485c008eae96c)
+++ uspace/srv/hid/fb/fb.c	(revision a47f52276416c12f15162cebefb4e81101e86a92)
@@ -990,6 +990,6 @@
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
-		printf("%s: Unable to register driver (%d)\n", NAME, rc);
-		return 1;
+		printf("%s: Unable to register driver\n", NAME);
+		return rc;
 	}
 	
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision d92c1ca83d148a7c2a672b0288f485c008eae96c)
+++ uspace/srv/ns/ns.c	(revision a47f52276416c12f15162cebefb4e81101e86a92)
@@ -48,5 +48,5 @@
 int main(int argc, char **argv)
 {
-	printf(NAME ": HelenOS IPC Naming Service\n");
+	printf("%s: HelenOS IPC Naming Service\n", NAME);
 	
 	int rc = service_init();
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision d92c1ca83d148a7c2a672b0288f485c008eae96c)
+++ uspace/srv/vfs/vfs.c	(revision a47f52276416c12f15162cebefb4e81101e86a92)
@@ -159,5 +159,5 @@
 int main(int argc, char **argv)
 {
-	printf(NAME ": HelenOS VFS server\n");
+	printf("%s: HelenOS VFS server\n", NAME);
 	
 	/*
@@ -165,5 +165,6 @@
 	 */
 	if (!vfs_nodes_init()) {
-		printf(NAME ": Failed to initialize VFS node hash table\n");
+		printf("%s: Failed to initialize VFS node hash table\n",
+		    NAME);
 		return ENOMEM;
 	}
@@ -175,5 +176,5 @@
 	    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
 	if (plb == (void *) -1) {
-		printf(NAME ": Cannot create address space area\n");
+		printf("%s: Cannot create address space area\n", NAME);
 		return ENOMEM;
 	}
@@ -196,11 +197,12 @@
 	async_set_interrupt_received(notification_received);
 	event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
-
+	
 	/*
 	 * Register at the naming service.
 	 */
-	if (service_register(SERVICE_VFS) != EOK) {
+	int rc = service_register(SERVICE_VFS);
+	if (rc != EOK) {
 		printf("%s: Cannot register VFS service\n", NAME);
-		return EINVAL;
+		return rc;
 	}
 	
@@ -208,5 +210,5 @@
 	 * Start accepting connections.
 	 */
-	printf(NAME ": Accepting connections\n");
+	printf("%s: Accepting connections\n", NAME);
 	async_manager();
 	return 0;