More changes for oc working without multiinstance enabled.