More fixes

Change-Id: I445d619cbdfcf840984b2f55e807344481c32d8f