More adjustments to patch file