A couple of line-wrapping fixes