Fixes domain issues