Amend to reflect PR feedback

This is a couple of little things left from the previous PR