Fixes for chat/alert