some mods

Change-Id: I267ae979d1dd4edb68ec1f0d6f815e2a42184829