Classpath and documentation changes