Improved OpenEUO compatibility