Fix some Cross-Origin issues