More EOL fixes.