Final fixup for the night