2 fixups.