Fix bugs in 1.6.X and add 1.7.X items.
Line endings