Fixes for patch file