Some fixes in dictionary