Redo some fixes after Git derped