Fix classpath for master branch