* Fix bad old commit and patch