Fixups based on PR comments