Final fix for build script