More fixes

Change-Id: I84de658bde859ddc545e9e9fb631110b76ca7b48