Updated to try harder to set PATH