Fix classpath and dependencies