MAIN-3274 CORS Allow-Origin | Fix refactoring errors