diff --git a/src/minimal_overlay/bundles/dropbear/02_build.sh b/src/minimal_overlay/bundles/dropbear/02_build.sh
index bf8469399..a0df2e8e4 100755
--- a/src/minimal_overlay/bundles/dropbear/02_build.sh
+++ b/src/minimal_overlay/bundles/dropbear/02_build.sh
@@ -19,10 +19,8 @@ echo "Configuring Dropbear..."
 ./configure \
   --prefix=/usr \
   --disable-zlib \
-  --disable-loginfunc \
-  CC="$CC" \
-  CFLAGS="$CFLAGS" \
-  LDFLAGS="$LDFLAGS"
+  --disable-loginfunc
+  CFLAGS="$CFLAGS"
 
 echo "Building Dropbear..."
 make -j $NUM_JOBS
diff --git a/src/minimal_overlay/bundles/links/02_build.sh b/src/minimal_overlay/bundles/links/02_build.sh
index 4d77ce1e4..340abf958 100755
--- a/src/minimal_overlay/bundles/links/02_build.sh
+++ b/src/minimal_overlay/bundles/links/02_build.sh
@@ -17,12 +17,14 @@ make -j $NUM_JOBS clean
 rm -rf $DESTDIR
 
 echo "Configuring Links..."
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" ./configure \
+CFLAGS="$CFLAGS" ./configure \
   --prefix=/usr \
   --disable-graphics \
   --disable-utf8 \
   --without-ipv6 \
-  --without-ssl
+  --without-ssl \
+  --without-zlib \
+  --without-x
 
 echo "Building Links..."
 make -j $NUM_JOBS
diff --git a/src/minimal_overlay/bundles/lua/02_build.sh b/src/minimal_overlay/bundles/lua/02_build.sh
index 088c1b141..f6e1edd7e 100755
--- a/src/minimal_overlay/bundles/lua/02_build.sh
+++ b/src/minimal_overlay/bundles/lua/02_build.sh
@@ -20,7 +20,7 @@ make -j $NUM_JOBS clean
 rm -rf $DESTDIR
 
 echo "Building Lua..."
-make -j $NUM_JOBS posix CC="$CC" CFLAGS="$CFLAGS"
+make -j $NUM_JOBS posix CFLAGS="$CFLAGS"
 
 make -j $NUM_JOBS install INSTALL_TOP="$DESTDIR/usr"
 
diff --git a/src/minimal_overlay/bundles/nweb/bundle.sh b/src/minimal_overlay/bundles/nweb/bundle.sh
index 40dd54058..a41888268 100755
--- a/src/minimal_overlay/bundles/nweb/bundle.sh
+++ b/src/minimal_overlay/bundles/nweb/bundle.sh
@@ -9,15 +9,8 @@ rm -rf $WORK_DIR/overlay/nweb
 mkdir -p $WORK_DIR/overlay/nweb
 cd $WORK_DIR/overlay/nweb
 
-set -x
-
 # nweb
-$CC $CFLAGS $LDFLAGS $SRC_DIR/nweb23.c -o nweb
-
-# client
-#$CC $CFLAGS $LDFLAGS $SRC_DIR/client.c -o client
-
-set +x
+gcc $CFLAGS $SRC_DIR/nweb23.c -o nweb
 
 echo "nweb has been build."
 
@@ -26,7 +19,6 @@ DESTDIR="$MAIN_SRC_DIR/work/src/minimal_overlay/rootfs"
 install -d -m755 "$DESTDIR/usr"
 install -d -m755 "$DESTDIR/usr/bin"
 install -m755 nweb "$DESTDIR/usr/bin/nweb"
-#install -m755 client "$DESTDIR/usr/bin/client"
 install -d -m755 "$DESTDIR/srv/www" # FHS compliant location
 install -m644 "$SRC_DIR/index.html" "$DESTDIR/srv/www/index.html"
 install -m644 "$SRC_DIR/favicon.ico" "$DESTDIR/srv/www/favicon.ico"
@@ -35,4 +27,5 @@ install -d -m755 "$DESTDIR/etc/autorun"
 install -m755 "$SRC_DIR/nweb.sh" "$DESTDIR/etc/autorun/90_nweb.sh"
 
 echo "nweb has been installed."
-echo "it will be autostarted on boot"
+echo "It will be autostarted on boot."
+
diff --git a/src/minimal_overlay/common.sh b/src/minimal_overlay/common.sh
index 9bda67606..ec624b41c 100755
--- a/src/minimal_overlay/common.sh
+++ b/src/minimal_overlay/common.sh
@@ -27,11 +27,12 @@ export NUM_JOBS=$((NUM_CORES * JOB_FACTOR))
 # sysroot flags for the compiler
 
 #-Wl,-nostdlib is required to make ld / gcc ignore the host's /usr/lib and /lib
-ld_flags="-Wl,-nostdlib $(grep -- \"-L\" $SYSROOT_SPECS)"
+#ld_flags="-Wl,-nostdlib $(grep -- \"-L\" $SYSROOT_SPECS)"
 #-static-libgcc is neeeded since we don't have the gcc-libs in our sysroot
-gcc_flags="-specs=$SYSROOT_SPECS -static-libgcc"
+#gcc_flags="-specs=$SYSROOT_SPECS -static-libgcc"
 
 # $ld_flags is passed 2 times because sometimes bundles ignore one of the variables
-export CC="${CC-gcc} $gcc_flags $ld_flags"
-export CFLAGS="$CFLAGS"
-export LDFLAGS="$LDFLAGS $ld_flags"
+#export CC="${CC-gcc} $gcc_flags $ld_flags"
+#export CFLAGS="$CFLAGS"
+#export LDFLAGS="$LDFLAGS $ld_flags"
+