Few fixes

Change-Id: I3870354956900aea0b7453f78f6ce25c113de0b4
2 files changed