Path tweaks and fixes