Small fixes to data dictionary