Fix disabled cross-origin code