Some IntelliJ fixes