diff --git a/doc/Maintainers-Guide.md b/doc/Maintainers-Guide.md
index 05bbb2c..086f458 100644
--- a/doc/Maintainers-Guide.md
+++ b/doc/Maintainers-Guide.md
@@ -18,7 +18,7 @@ This will compile and create the extension handler zip package to `bundle/` dire
 ### 2. Upload the package
 
 Extension follows the semantic versioning [MAJOR].[MINOR].[PATCH]. The MAJOR/MINOR
-are stored in the `Makefile` and PATCH is the build date of the bundle in `yymmddHHMM`
+are stored in the `Makefile` and PATCH is the UTC build date of the bundle in `yymmddHHMM`
 format.
 
 * **Bump `MAJOR` if**: you are introducing breaking changes in the config schema
diff --git a/scripts/run-in-background.sh b/scripts/run-in-background.sh
index fbd8656..1acbdd2 100755
--- a/scripts/run-in-background.sh
+++ b/scripts/run-in-background.sh
@@ -2,6 +2,11 @@
 set -eu
 readonly SCRIPT_DIR=$(dirname $0)
 
+# Script logs its output (stdout/stderr) simultaneously to a file
+# as waagent does not capture output of processes it starts.
+exec > >(tee -ia /var/log/azure-docker-extension-enable.log)
+exec 2>&1
+
 # This script kicks off the ./bin/docker-extension in the
 # background and disowns it with nohup. This is a workaround
 # for the 5-minute time limit for 'enable' step and 15-minute
@@ -53,4 +58,4 @@ write_status() {
 
 write_status
 set -x
-nohup $(readlink -f "$SCRIPT_DIR/../bin/docker-extension") $@ > /var/log/nohup.log &
+nohup $(readlink -f "$SCRIPT_DIR/../bin/docker-extension") $@ &