More wordwrap fixes