Intellij fixes for Java 7