some other slight improvements

Change-Id: Icadfcefa3038fa940149b56c1ce4cc440563803f