Classpath adjustments