Line wrapping fixes