fixed small cross domain issues