Fixed some stuff IntelliJ refactoring screwed up.