Fixed some parameters handling in dictionaries.