Fix system wide path issues