Resolved classpath issues