IntelliJ compatibility fixes