Fix some mangled commits from the auto-commit bot