More domain fixing