Fixed some IntelliJ problems