Make asset helper getUrl and getUrlPath conistent with use elsewhere
Fix conflicts