Fixes to caret & avatar in collab mode

Unbreaking some things that broke over the last month in collab mode.