Possible fixes for Java 7.