Fixing domain stuff