Handle some new line stuff a bit better