More EOL conversions