Fixes for missing entries

Change-Id: I69243428b1803044553dfba7c19cb146a9e9675a