tweaks

Change-Id: Ib10711bd6fa2350c3a5900badbd451a8da8b5ba9