Some fixes

Change-Id: Id2cbcd638eb5b5ceda40fd4800fd81455c6e7dad