More new line fixes