also fix other patch files suffering from similar issues