Make crud.fix carry over more stuff
Merge pull request #3 from iffy/fix-fixes

Make crud.fix carry over more stuff
Fix merge conflict