Fix line wrapping consistency - round 1