Final fixups.