123531: Fixes for the patch creation.