Tweaks for java 1.6
Java 1.6 tweaks