Fix up library versions and classpath