[IM] Review fixes