Fix a bunch of oversights.
Again.