fixes

Change-Id: I47d04922a065e9a1a31ba677f948913adcd2d851