Some CORS fast-fixes.