Some classpath fixes