Fix classpath issues