Fixes for domain mapping.