Cross-Domain options fixes