Fix domain management stuff