Build script migration fixes