Fixes inconsistencies in domain creation handling.