Fix Java 1.6 issues