Fixed minor issues with conversations