[Installer] PR Fixes