diff --git a/uppsrc/Core/LocalProcess.cpp b/uppsrc/Core/LocalProcess.cpp
index 8b11249ba..cd65f1ad7 100644
--- a/uppsrc/Core/LocalProcess.cpp
+++ b/uppsrc/Core/LocalProcess.cpp
@@ -426,7 +426,7 @@ bool LocalProcess::IsRunning() {
 		return false;
 	}
 	int status = 0, wp;
-	if(!( (wp = waitpid(pid, &status, WNOHANG | WUNTRACED)) == pid && 
+	if(!( (wp = waitpid(pid, &status, WNOHANG | WUNTRACED)) == pid &&
 	      DecodeExitCode(status) ))
 		return true;
 	LLOG("IsRunning() -> no, just exited, exit code = " << exit_code);
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 331c70bde..2e8fd8291 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -255,8 +255,9 @@ void InstantSetup()
 			bmSet(bm, "DEBUG_LINK", "");
 			bmSet(bm, "RELEASE_BLITZ", "");
 			bmSet(bm, "RELEASE_LINKMODE", "0");
-			bmSet(bm, "RELEASE_OPTIONS", "-O3 -ffunction-sections");
-			bmSet(bm, "RELEASE_SIZE_OPTIONS", "-O3 -Os -finline-limit=20 -ffunction-sections");
+			String olevel = x64 ? "-O3 " : "-Os ";
+			bmSet(bm, "RELEASE_OPTIONS", olevel + "-ffunction-sections");
+			bmSet(bm, "RELEASE_SIZE_OPTIONS", olevel + "-finline-limit=20 -ffunction-sections");
 			bmSet(bm, "RELEASE_FLAGS", "");
 			bmSet(bm, "RELEASE_LINK", "");
 			bmSet(bm, "DEBUGGER", "gdb");