Patches for EhLib 3.6 (and maybe later)