Fixed classpath issues