Fixes to client dictionary.