Fix up some last minute things.