Aug6 classpath fix