fixes

Change-Id: Ic3e936bd01f2fe2507f1f04528e7c5961d23bf13