Fix patches
Fix latest merge