Patches applied
Fixes