Minor fixups.
Minor fixups.