More path issues fixed