Some newline fixes etc