fixes for classpath