Fix up some things.