Changes towards CORS compliancy