Newline/space fixes