#98 Build script improvements