More line break fixes