Fixed some PATH issues