patchediting fixes