Fix remaining problems in domain configuration