diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
index 623364093..fe07bc422 100644
--- a/baseimage/initializeBaseUbuntuImage.sh
+++ b/baseimage/initializeBaseUbuntuImage.sh
@@ -38,8 +38,8 @@ update-grub
 echo "==== Install nodejs ===="
 mkdir -p /usr/local/node-6.9.2
 curl -sL https://nodejs.org/dist/v6.9.2/node-v6.9.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.9.2
-ln -s /usr/local/node-6.9.2/bin/node /usr/bin/node
-ln -s /usr/local/node-6.9.2/bin/npm /usr/bin/npm
+ln -sf /usr/local/node-6.9.2/bin/node /usr/bin/node
+ln -sf /usr/local/node-6.9.2/bin/npm /usr/bin/npm
 apt-get install -y python   # Install python which is required for npm rebuild
 [[ "$(python --version 2>&1)" == "Python 2.7."* ]] || die "Expecting python version to be 2.7.x"
 
diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index b3f69d15e..22d7db0a8 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -171,7 +171,7 @@ fi
 echo "=> Downloading and running installer for version ${version} ... (this takes some time)"
 box_src_tmp_dir=$(mktemp -dt box-src-XXXXXX)
 
-if ! $curl -sL "${sourceTarballUrl}" | tar -zxf - -C "${box_src_tmp_dir}"; then
+if ! curl -sL "${sourceTarballUrl}" | tar -zxf - -C "${box_src_tmp_dir}"; then
     echo "Could not download source tarball. See ${LOG_FILE} for details"
     exit 1
 fi