Tweaking some more of the path related aspects