diff --git a/build_scripts/debian/build.sh b/build_scripts/debian/build.sh
index 6f2d05283ce..07c2a4a987f 100755
--- a/build_scripts/debian/build.sh
+++ b/build_scripts/debian/build.sh
@@ -55,7 +55,12 @@ make install
 # note: This installation step could happen in debian/rules but was unable to escape $ char.
 # It does not affect the built .deb file though.
 $source_dir/python_env/bin/pip3 install wheel
-for d in $source_dir/src/azure-cli $source_dir/src/azure-cli-core $source_dir/src/azure-cli-nspkg $source_dir/src/azure-cli-command_modules-nspkg $source_dir/src/command_modules/azure-cli-*/; do cd $d; $source_dir/python_env/bin/python3 setup.py bdist_wheel -d $tmp_pkg_dir; cd -; done;
+for d in $source_dir/src/azure-cli $source_dir/src/azure-cli-core $source_dir/src/azure-cli-nspkg \
+  $source_dir/src/azure-cli-command_modules-nspkg $source_dir/src/command_modules/azure-cli-*/;
+  do cd $d;
+  $source_dir/python_env/bin/python3 setup.py bdist_wheel -d $tmp_pkg_dir;
+  cd -;
+done;
 all_modules=`find $tmp_pkg_dir -name "*.whl"`
 $source_dir/python_env/bin/pip3 install $all_modules
 $source_dir/python_env/bin/pip3 install --force-reinstall --upgrade azure-nspkg azure-mgmt-nspkg
diff --git a/build_scripts/docker/README.md b/build_scripts/docker/README.md
index a32b9e7e08f..04bc07d4f07 100644
--- a/build_scripts/docker/README.md
+++ b/build_scripts/docker/README.md
@@ -19,7 +19,17 @@ Verification
 Run the image.
 
 ```
-$ sudo docker run -it azuresdk/azure-cli-python:${CLI_VERSION}
+$ docker run -it azuresdk/azure-cli-python:${CLI_VERSION}
 $ az
 $ az --version
 ```
+
+Save the image
+```
+docker save -o docker-azuresdk-azure-cli-python-VERSION.tar azuresdk/azure-cli-python:${CLI_VERSION}
+```
+
+Load the saved image
+```
+docker load -i docker-azuresdk-azure-cli-python-VERSION.tar
+```
diff --git a/build_scripts/rpm/README.md b/build_scripts/rpm/README.md
index 4dc373f35d9..a64dfe7c681 100644
--- a/build_scripts/rpm/README.md
+++ b/build_scripts/rpm/README.md
@@ -16,9 +16,10 @@ Build example:
 Note: use the full path to the repo path, not a relative path.
 ```
 git clone https://github.com/azure/azure-cli
+cd azure-cli
 export CLI_VERSION=2.0.16
-export REPO_PATH=~/azure-cli
-rpmbuild -v -bb --clean azure-cli/build_scripts/rpm/azure-cli.spec
+export REPO_PATH=$(pwd)
+rpmbuild -v -bb --clean build_scripts/rpm/azure-cli.spec
 ```
 
 Verification
diff --git a/build_scripts/rpm/azure-cli.spec b/build_scripts/rpm/azure-cli.spec
index c8a6315bfe7..1ffd8979053 100644
--- a/build_scripts/rpm/azure-cli.spec
+++ b/build_scripts/rpm/azure-cli.spec
@@ -36,7 +36,6 @@ A great cloud needs great tools; we're excited to introduce Azure CLI 2.0,
 %prep
 # Create some tmp files
 tmp_venv_archive=$(mktemp)
-tmp_source_archive=$(mktemp)
 
 # Download, Extract Virtualenv
 wget %{venv_url} -qO $tmp_venv_archive
diff --git a/build_scripts/windows/scripts/build.cmd b/build_scripts/windows/scripts/build.cmd
index 9c564445d5c..195b27847f2 100644
--- a/build_scripts/windows/scripts/build.cmd
+++ b/build_scripts/windows/scripts/build.cmd
@@ -109,7 +109,6 @@ echo Built CLI packages successfully.
 
 if %errorlevel% neq 0 goto ERROR
 
-
 set ALL_MODULES=
 for %%i in (%TEMP_SCRATCH_FOLDER%\*.whl) do (
     set ALL_MODULES=!ALL_MODULES! %%i