Fix nil value dictionaries