Installation infra

Propagate some minor refactoring to the infra.