Small changes

Change-Id: Icec1bb5d219e1eeda8a78797896c646efa6ac245