Tweaks needed for Eyescale/Equalizer#68