Cors issues fix