Minor changes. Switching to JDK 1.6