CR/LF problems after upgrade