Minor fixups and updates.