Fix missing occurrences to update to Java 1.7