Update build to work better with git