Fix cors header issues