WIP build script improvements