Fixing issues with unread counts