Please split the patch into two, one for each issue.  And remove the `*.orig` files from the patch.