Fix domain errors