classpath and checkstyle fixes.