Merge in classpath discovery fixes