Fixups from comments