More classpath fixes
Import adjustments