Build script bugfixes