fix bunch of errors

Change-Id: Ic60202e640507c7e071aa8253edd83c37a35dbf8