diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 3574fe6bf..2192960e4 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
 #------------------------------------------------------------------------------
-# Script used for cross-platform comparison as part of the travis automation.
-# Splits all test source code into multiple files, generates bytecode and
-# uploads the bytecode into github.com/ethereum/solidity-test-bytecode where
-# another travis job is triggered to do the actual comparison.
+# Script used for cross-platform comparison of the bytecode generated by the compiler.
+# Splits all test source code into multiple files, generates bytecode and metadata
+# for each file and combines it into a single report.txt file.
+#
+# The script is meant to be executed in CI on all supported platforms. All generated
+# reports must be identical for a given compiler version.
 #
 # ------------------------------------------------------------------------------
 # This file is part of solidity.
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
index 41e554139..fbe5a9d60 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
@@ -45,7 +45,7 @@ set +e
 if [ -e scripts/ci/build_emscripten.sh ]; then
   scripts/ci/build_emscripten.sh
 else
-  # The script used to be in scripts/ci/ in earlier versions.
+  # The script used to be in scripts/travis-emscripten/ in earlier versions.
   scripts/travis-emscripten/build_emscripten.sh
 fi
 
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 6293d182b..9ef9caaa8 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -27,7 +27,7 @@ done
 SOLIDITY_REPO_URL="https://github.com/ethereum/solidity"
 SOLC_JS_REPO_URL="https://github.com/ethereum/solc-js"
 SOLC_JS_BRANCH=wasmRebuildTests
-RELEASE_URL="https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin"
+RELEASE_URL="https://binaries.soliditylang.org/bin"
 RELEASE_COMMIT_LIST_URL="$RELEASE_URL/list.txt"
 
 SCRIPTDIR=$(dirname "$0")
@@ -196,6 +196,7 @@ cp scripts/bytecodecompare/storebytecode.sh /tmp
 # shellcheck disable=SC2016
 sed -i -e 's/rm -rf "\$TMPDIR"/cp "\$TMPDIR"\/report.txt \/tmp\/report.txt ; rm -rf "\$TMPDIR"/' /tmp/storebytecode.sh
 sed -i -e 's/REPO_ROOT=.*/REPO_ROOT=\/src/' /tmp/storebytecode.sh
+sed -i -e 's/git clone/git clone --branch '"${SOLC_JS_BRANCH}"'/' /tmp/storebytecode.sh
 export SOLC_EMSCRIPTEN="On"
 
 echo "Check out solc-js repository..."
@@ -213,7 +214,9 @@ ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin
 rm -rf /src
 ln -sf /root/project /src
 
+echo "Install dependencies and upgrade system packages."
 apt-get -qq update >/dev/null 2>&1
+apt-get -qq upgrade >/dev/null 2>&1
 apt-get -qq install cmake >/dev/null 2>&1
 
 echo "Create output directories."
@@ -228,7 +231,6 @@ mkdir -p "${OUTPUTDIR}"/bin
 echo "Prepare solc-js."
 cd /root/solc-js
 npm install >/dev/null 2>&1
-npm run build >/dev/null 2>&1
 
 echo "Install semver helper."
 npm install -g semver >/dev/null 2>&1
@@ -238,6 +240,7 @@ wget -q "${RELEASE_COMMIT_LIST_URL}" -O /tmp/release_commit_list.txt
 
 cd /src
 TAGS=$(git tag --list "${TAG_FILTER}" | tac)
+echo "Matching tags: ${TAGS}"
 for TAG in ${TAGS}; do
   process_tag "${TAG}"
 done