path param fixes and locator fixes