Fix some issues and classpath