Fix Path endpoints