Fix Intercom bugs