fix issue with jdk 1.7
fix oracle issues
various 2.9 issues