Fixing bugs related to opal manager