Changed some PATH dependent lines