Fix broken sender references
Fix small bug with re-casting causing duplicate chats