Fix the build as is migrated to GIT