Fix build scripts
Final fix for build scripts