Fix errors

Change-Id: Iaf1f0d6a698aae4c32f41bcac24112d279dbfddf