Fixing domain creation issues