Minor changes

Change-Id: I3d1cc8538c6430027fa7b1f4ad66bc424f784a9b