more build script modifications