Further tweak classpath