Patched up a bunch of things.