Minor classpath changes