Fixed classpath related errors