Fix patchinfo files after refactoring