Build script fixes (versions in dir)