small changes

Change-Id: I17dd71392ee2623819fed99fe31077ba77b8ef7f