Further tweak jdk 6 compatibility