Fix a few issues with git moving.