Updated: Ensure JDK 1.6