dictionaries fixes