Fixed a few cross-chat sync issues