Some minor changes

Change-Id: Iddc9c3668df429bbaed86719fdcffd063b287c10