Bux fixes to class Dictionary