Fixed classpath problems