Fix JDK 1.6 issues