Fixes of conversations refactoring