add 2 CRs to fix dos<->unix problem