Intercom tweaks