Fix problems with CORS