Some small changes + a bit more on CORS