Syntax and eol fixes