more tweaks

Change-Id: I61dfdcfe7ba348172bcefdb3a7b1136208ee06ae