Fix up some more stuff.