more tweakage

Change-Id: I3edb4669f49269109761f1a0a0808a6ffa503d08