Correct git fuckups, fixes