Final fix for build scripts