Fixing classpath issues