Fix errors

Change-Id: I1245c83e24e29b31b3ef8324ee32e7235174f0c1