Fix a few nits caused by perl strict, and remove windows newline characters from EOL