Minor fixes

Change-Id: Iefc1eae80bb79d2883d21e927a7d2835f90fcfc2