diff --git a/build.sh b/build.sh
index aa1543f4d..d46dded74 100755
--- a/build.sh
+++ b/build.sh
@@ -96,16 +96,18 @@ else
 fi
 
 MYARCH=linux-x86_64
-NCPU=4
-if uname -s | grep -i "linux" > /dev/null ; then
-	MYARCH=linux-x86_64
-	NCPU=`cat /proc/cpuinfo | grep -c -i processor`
-fi
-if uname -s | grep -i "darwin" > /dev/null ; then
-	MYARCH=darwin-x86_64
-fi
-if uname -s | grep -i "windows" > /dev/null ; then
-	MYARCH=windows-x86_64
+if [ -z "$NCPU" ]; then
+	NCPU=4
+	if uname -s | grep -i "linux" > /dev/null ; then
+		MYARCH=linux-x86_64
+		NCPU=`cat /proc/cpuinfo | grep -c -i processor`
+	fi
+	if uname -s | grep -i "darwin" > /dev/null ; then
+		MYARCH=darwin-x86_64
+	fi
+	if uname -s | grep -i "windows" > /dev/null ; then
+		MYARCH=windows-x86_64
+	fi
 fi
 
 $quick_rebuild || rm -r -f project/bin/* # New Android SDK introduced some lame-ass optimizations to the build system which we should take care about
diff --git a/project/jni/application/ninslash/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh
index 1b6a7b7cf..7d7e5f3bf 100755
--- a/project/jni/application/ninslash/AndroidPreBuild.sh
+++ b/project/jni/application/ninslash/AndroidPreBuild.sh
@@ -54,6 +54,6 @@ for ARCH in armeabi-v7a x86; do
 	cd ../..
 done
 
-ln -s ../src/logo.png ../AndroidData/
+ln -s -f ../src/logo.png ../AndroidData/
 
 exit 0
diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src
index cc10a1392..d50a673b5 160000
--- a/project/jni/application/ninslash/src
+++ b/project/jni/application/ninslash/src
@@ -1 +1 @@
-Subproject commit cc10a13927e52227ec5d04eb3f0f4e3a28cd1220
+Subproject commit d50a673b5626d6d16b058d6aeeee876636dc7ae7