minor fixups for data structure changes.