diff --git a/makepkg.conf b/makepkg.conf
index bcd9acf..83b6b49 100644
--- a/makepkg.conf
+++ b/makepkg.conf
@@ -10,5 +10,7 @@ done
 
 # Enables all extra features supported by host CPU
 
-CFLAGS="$CFLAGS -march=native -mtune=native"
-CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
+if [ "${SKIP_NATIVE-n}" = n ]; then
+	CFLAGS="$CFLAGS -march=native -mtune=native"
+	CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
+fi
diff --git a/run.sh b/run.sh
index b178663..db21263 100755
--- a/run.sh
+++ b/run.sh
@@ -20,7 +20,6 @@ cd ./w
 
 if [ "${DEBUG_SHELL-n}" = y ]; then
 	echo "Stopping before build... Run 'exit 1' to skip building"
-	tail -12 "$0"
 	bash
 fi
 
@@ -34,9 +33,9 @@ fi
 
 LOGDEST=../output PKGDEST=../output makepkg --syncdeps --log
 
-sudo cp -r ../output /w
-
 if [ "${DEBUG_SHELL-n}" = y ]; then
 	echo "Build complete"
 	bash
 fi
+
+sudo cp -r ../output /w