Release 2 corrections. More line ending horrors