fixed some issues

Change-Id: I715c3ad081dd28cd418c6192ec3e6c9f76d3bdb5