Small fixes from Chat