Linebreak fixes