Fixes for Java 7u45