fix failures

Change-Id: Id233e758856b2559b12c916f1a2fffd5c84db4cd