Fixes in previous commit

Change-Id: I7838f8d000e01d0643babaac70a8781976e057bc