Some fix

Change-Id: I34b84bfaf564609bac75c4733ae57850a04bedb3