Fixing classpath hilarity