More conversation fixes and additions