Index: uspace/app/bdsh/exec.c
===================================================================
--- uspace/app/bdsh/exec.c	(revision 5044114fbee4c5e1d76373641fe69c88fb17fa88)
+++ uspace/app/bdsh/exec.c	(revision 55fe22044a62f061c5f26a03928ac9bea434ff4c)
@@ -141,4 +141,5 @@
 	}
 
+	task_wait_set(&twait, TASK_WAIT_EXIT | TASK_WAIT_RETVAL);
 	rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv,
 	    file_handles[0], file_handles[1], file_handles[2]);
Index: uspace/app/getterm/getterm.c
===================================================================
--- uspace/app/getterm/getterm.c	(revision 5044114fbee4c5e1d76373641fe69c88fb17fa88)
+++ uspace/app/getterm/getterm.c	(revision 55fe22044a62f061c5f26a03928ac9bea434ff4c)
@@ -169,6 +169,7 @@
 	task_id_t id;
 	task_wait_t twait;
+	task_wait_set(&twait, TASK_WAIT_EXIT);
+	errno_t rc = task_spawnv(&id, &twait, cmd, (const char *const *) args);
 
-	errno_t rc = task_spawnv(&id, &twait, cmd, (const char *const *) args);
 	if (rc != EOK) {
 		printf("%s: Error spawning %s (%s)\n", APP_NAME, cmd,
@@ -176,8 +177,6 @@
 		return rc;
 	}
-
-	task_exit_t texit;
-	int retval;
-	rc = task_wait(&twait, &texit, &retval);
+	
+	rc = task_wait(&twait, NULL, NULL);
 	if (rc != EOK) {
 		printf("%s: Error waiting for %s (%s)\n", APP_NAME, cmd,
Index: uspace/app/sbi/src/os/helenos.c
===================================================================
--- uspace/app/sbi/src/os/helenos.c	(revision 5044114fbee4c5e1d76373641fe69c88fb17fa88)
+++ uspace/app/sbi/src/os/helenos.c	(revision 55fe22044a62f061c5f26a03928ac9bea434ff4c)
@@ -255,4 +255,5 @@
 	int retval;
 
+	task_wait_set(&twait, TASK_WAIT_EXIT);
 	rc = task_spawnv(&tid, &twait, cmd[0], (char const *const *) cmd);
 	if (rc != EOK) {
@@ -263,5 +264,5 @@
 
 	/* XXX Handle exit status and return value. */
-	rc = task_wait(&twait, &texit, &retval);
+	rc = task_wait(&twait, NULL, NULL);
 	(void) rc;
 
Index: uspace/app/vlaunch/vlaunch.c
===================================================================
--- uspace/app/vlaunch/vlaunch.c	(revision 5044114fbee4c5e1d76373641fe69c88fb17fa88)
+++ uspace/app/vlaunch/vlaunch.c	(revision 55fe22044a62f061c5f26a03928ac9bea434ff4c)
@@ -66,4 +66,5 @@
 	task_id_t id;
 	task_wait_t wait;
+	task_wait_set(&wait, TASK_WAIT_RETVAL);
 	errno_t rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
 	if (rc != EOK) {
@@ -72,9 +73,8 @@
 		return -1;
 	}
-
-	task_exit_t texit;
+	
 	int retval;
-	rc = task_wait(&wait, &texit, &retval);
-	if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
+	rc = task_wait(&wait, NULL, &retval);
+	if ((rc != EOK)) {
 		printf("%s: Error retrieving retval from %s (%s)\n", NAME,
 		    app, str_error(rc));
Index: uspace/lib/pcut/src/os/helenos.c
===================================================================
--- uspace/lib/pcut/src/os/helenos.c	(revision 5044114fbee4c5e1d76373641fe69c88fb17fa88)
+++ uspace/lib/pcut/src/os/helenos.c	(revision 55fe22044a62f061c5f26a03928ac9bea434ff4c)
@@ -176,4 +176,5 @@
 
 	task_wait_t test_task_wait;
+	task_wait_set(&test_task_wait, TASK_WAIT_EXIT | TASK_WAIT_RETVAL);
 	rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
 	    fileno(stdin), tempfile, tempfile);
Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision 5044114fbee4c5e1d76373641fe69c88fb17fa88)
+++ uspace/srv/hid/remcons/remcons.c	(revision 55fe22044a62f061c5f26a03928ac9bea434ff4c)
@@ -239,4 +239,5 @@
 	task_id_t task;
 	task_wait_t wait;
+	task_wait_set(&wait, TASK_WAIT_EXIT | TASK_WAIT_RETVAL);
 	errno_t rc = task_spawnl(&task, &wait, APP_GETTERM, APP_GETTERM, user->service_name,
 	    "/loc", "--msg", "--", APP_SHELL, NULL);