Fixed classpath references