jdk7 corrections