FIXUP against initial labs: Fix classpath containers