Yet more dialog reworks