[20] Minor fixups.