Trying to fix compile issues with JDK 1.6.