Applied classpath fixes