Fix croos domain issues