Build script fixes
Formatting!