fixes

Change-Id: I8eaef70e778d17ef570ae5b0b7f5b9a53eafc898