jdk 1.6 fixes
Working