More install changes

Kudos again to @andresmrm