More classpath updates