Still tackling EOL issues