Fixed more errors cased by IntelliJ mucking with git4idea