Fixed classpath bugs