Resolve newline issues