More things from me

Change-Id: I1b4a27aae65cb9019799bfb675efd7a281235fb7