Last bit of fixups.