Some string wrapping fixes