Fix up some things