WIP: Some changes after running through install

Just some minor tweaks based on my run through of the install.

Merge request reports

Loading