Fix some things, but not everything.