Fix new dominator related issues