Various multiline output fixes