Fixes in last commit

Change-Id: I78ea2996664ec3d5a9c598bd399c63503d043f6c