Patches in the short term compatibility with <0.11.10