Fixes in Dictionaries