IntelliJ related fixes.