more tweakage

Change-Id: Id6532d5569c6c8abeafbff117b194b1937a38adf