Fixes on domain management0