Minor CLASSPATH improvement