Patching fixes