Path fixes and refinements