Minor fixups.