Fixing the git funkies