Updates to fix issues with multiple CORS options requests