diff --git a/README.md b/README.md
index 6d07ade..a7e9983 100644
--- a/README.md
+++ b/README.md
@@ -61,10 +61,11 @@ You have to have following packages installed in your system:
 
  * GNU autoconf
  * GNU flex 2.5.x
- * GNU gcc 4.x
+ * GNU gcc 4.x *32-bit version!*
  * GNU make 3.x
  * lha
  * perl 5.10
+ * libncurses5-dev *32-bit version!*
 
 *For MacOSX users*: you'll likely need to have [MacPorts](http://www.macports.org) or [Homebrew](http://brew.sh) installed in order to build the toolchain.
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 5ea9e12..2cf0486 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,7 +7,7 @@ readonly SOURCES="${TOP_DIR}/sources"
 readonly BUILD_DIR="${TOP_DIR}/build"
 readonly HOST_DIR="${TOP_DIR}/host"
 readonly STAMP="${TOP_DIR}/stamps"
-readonly MAKE="make -j$(getconf NPROCESSORS_CONF)"
+readonly MAKE="make -j$(getconf _NPROCESSORS_CONF)"
 
 function prepare_target {
   mkdir -p "${STAMP}" "${BUILD_DIR}" "${PREFIX}"
@@ -50,15 +50,18 @@ function unpack_clean {
   while (( "$#" > 1 )); do
     shift
 
-    if grep "\.tar\.gz$" <<<"$1"; then
-      cmd="tar -xzf"
-    elif grep "\.tar.bz2$" <<<"$1"; then
-      cmd="tar -xjf"
-    elif grep "\.lha$" <<<"$1"; then
-      cmd="lha -xgq"
-    else
-      cmd="false"
-    fi
+    case "$1" in
+      *.tar.gz)
+        cmd="tar -xzf";;
+      *.tar.bz2)
+        cmd="tar -xjf";;
+      *.lha)
+        cmd="lha -xq";;
+      *.zip)
+        cmd="unzip";;
+      *)
+        cmd="false";;
+    esac
 
     ${cmd} "${ARCHIVES}/$1"
   done
@@ -117,7 +120,7 @@ function unpack_sources {
   popd
 
   unpack_clean "${NDK}" "${NDK_SRC}"
-  rm -rf ndk_* *.info
+  rm -f *.info
   pushd "${NDK}"
   mkdir Include/include_h/inline
   copy_non_diff "${NDK}"
diff --git a/examples/test-mmu.c b/examples/test-mmu.c
index 54be1c6..34dfa6c 100644
--- a/examples/test-mmu.c
+++ b/examples/test-mmu.c
@@ -10,7 +10,7 @@
 
 long __nocommandline = 1;
 
-BOOL PrintMMUInfo() {
+static BOOL PrintMMUInfo() {
   PutStr("MMU: ");
 
   switch (GetMMUType()) {
diff --git a/scripts/mk-diff-tree.sh b/scripts/mk-diff-tree.sh
index c1351b1..1ba4c06 100755
--- a/scripts/mk-diff-tree.sh
+++ b/scripts/mk-diff-tree.sh
@@ -18,8 +18,10 @@ $diff -durq "$1.orig" "$1" | while read -a line; do
     "Only")
       file="${line[2]%:}/${line[3]}"
       dir="../patches/${line[2]%:}"
-      mkdir -p "${dir}"
-      cp -v "${file}" "${dir}/"
+      if ! [[ "${file}" =~ ~$ ]]; then
+        mkdir -p "${dir}"
+        cp -v "${file}" "${dir}/"
+      fi
       ;;
     *)
       ;;
diff --git a/sdk/cgx.sdk b/sdk/cgx.sdk
index 74d71b4..c98e9ad 100644
--- a/sdk/cgx.sdk
+++ b/sdk/cgx.sdk
@@ -7,7 +7,6 @@ CGraphX/Autodocs/cybergraphics.doc
 CGraphX/C/Include/clib/cybergraphics_protos.h
 CGraphX/C/Include/cybergraphx/cybergraphics.h
 CGraphX/C/Include/pragmas/cybergraphics_pragmas.h
-CGraphX/C/Include/proto/cybergraphics.h
 CGraphX/FD/cybergraphics_lib.fd
 fd2sfd : CGraphX/FD/cybergraphics_lib.fd CGraphX/C/Include/clib/cybergraphics_protos.h
 sfdc : cybergraphics_lib.sfd