Setup can't be done in separate container yet and a few fixups