diff --git a/src/kernel/apps/init.c b/src/kernel/apps/init.c
index b3ebc942be..934ed851ca 100644
--- a/src/kernel/apps/init.c
+++ b/src/kernel/apps/init.c
@@ -35,7 +35,7 @@ main()
 	{
 		team_id pid;
 
-		pid = _kern_create_team("/boot/bin/fortune", "/boot/bin/fortune", NULL, 0, NULL, 0, 5);
+		pid = _kern_create_team("/bin/fortune", "/bin/fortune", NULL, 0, NULL, 0, 5);
 		if (pid >= 0) {
 			int retcode;
 			_kern_wait_for_team(pid, &retcode);
@@ -46,7 +46,7 @@ main()
 	while (1) {
 		team_id pid;
 
-		pid = _kern_create_team("/boot/bin/shell", "/boot/bin/shell", NULL, 0, NULL, 0, 5);
+		pid = _kern_create_team("/bin/shell", "/bin/shell", NULL, 0, NULL, 0, 5);
 		if (pid >= 0) {
 			int retcode;
 			printf("init: spawned shell, pid 0x%lx\n", pid);
diff --git a/src/kernel/apps/shell/statements.c b/src/kernel/apps/shell/statements.c
index 0f541afb8f..ed05cfa783 100644
--- a/src/kernel/apps/shell/statements.c
+++ b/src/kernel/apps/shell/statements.c
@@ -709,42 +709,32 @@ int parse_info(scan_info *info)
 			break;
 
 		case SVO_EXIT :
-			if(scan(info)){
-
+			if (scan(info))
 				err = SHE_SCAN_ERROR;
-
-			} else {
-
+			else
 				err = handle_exit(info);
-
-			}
-         
 			break;
 
 		default:
-			return shell_parse(info->input_line,strlen(info->input_line));
-
+			return shell_parse(info->input_line, strlen(info->input_line));
 	}
 
-	if(err != SHE_NO_ERROR){
-
-		if(err == SHE_SCAN_ERROR) err = info->scan_error;
-		ste_error_to_str(err,err_txt);
-		printf("error :%d:%ld,  %d-%s \n",info->line_no,
-		                                 info->scanner - info->input_line - strlen(info->token),
-		                                 err,
-		                                 err_txt);
-
+	if (err != SHE_NO_ERROR) {
+		if (err == SHE_SCAN_ERROR)
+			err = info->scan_error;
+		ste_error_to_str(err, err_txt);
+		printf("error :%d:%ld,  %d-%s \n", info->line_no,
+			info->scanner - info->input_line - strlen(info->token),
+			err, err_txt);
 	}
 	return err;
 }
 
 
-
-void init_statements(void){
-
-	shell_var_set_text(NAME_VAR_PATH,".:/:/boot:/boot/bin");
-
+void
+init_statements(void)
+{
+	shell_var_set_text(NAME_VAR_PATH, ".:/:/boot:/boot/bin:/boot/beos/bin");
 }