Java 6 vs 7 tweaks