Another fix to path issues