Minor changes

Change-Id: Ie745ee8006ab63878cacc10c60c816cfc070245f