Additional fixes to multiline responses