Fix to a couple of issues visible in the dictionary