When adding the common helper scripts, the required patches were forgotten. This merge request adds them.