More fixes

Change-Id: I57443b594a99d615d486a7b6a87baff61e948745