Fixed dictionary-related items

Change-Id: Ia3e5160409afe3e18e6f27d76f77daf7f57cbfd8