Fixed some duplicate PATH issues