Fix/cors issues