Post CR fixes (idents fixes and comments update)