Lots of fixes to paths