Fix some line-wrapping