CORS updates and a bug fix.