Update setup/build scripts
Bugfixes