minor fixes

Change-Id: Ib042cb5514a357e398dd61309ed198dda230c21e