Chat General Fixes