couple of nice things

Change-Id: Ic44def0f3914e2a477fa3d6a12096ae2a70f2802