More path fixes
Fix #582