Attempting cross domain fixes