Improve install path redundancy