classpath fixes?