Fix bugs in General Chat Notifications