Make the PATH management a little more robust across machines