more classpath fixes