Patch with changes that were missing on conversion to git