Comment fixups