Fixing weird stuff going on with git...