Partially fix EOL comments