Minor improvements

Change-Id: I80835f9f7e0e5339e6026fdd95e227d2702e2d0b