Fix some linebreak issues