Attached is a proposed patch to install, with the two changes requested.

This is cosmetic patch.