Fix a bunch of things, break others.