Fixed cross domain issues