Fixing mistakes I made because of git's shitty interface