Build script changes and whitespace fix