Missed build-shell-script changes