fixing errors

Change-Id: I87e05db32a6f18a8bd9661137a99a4ab37aabed2