conversation related fixes