More classpath changes.