Minor fix

Change-Id: I302354f41e90d981b237cc1e137d932427b795ba
More improvements

Change-Id: I8a9d741f26c75e620f218bbc1631c18fc71cfd84