Tweak stuff

Change-Id: I1ca465251e8f4548975bf2aff90f0380f6d32e14