More review fixes based on feedback from gthomas and sedge