Small tweaks / changes to installation controller