More fixes

Change-Id: I86234d630f6fdbeb5509be7e6fe0fe7ff067d2a5