eol and attribute fixes