Classpath changes to fix build problems