Minor fixes

Change-Id: Ib05d71431575b923c7c0ca7221b22820bb221a8b