fixes for Users & Chat