added some fixes to the classpath handling