fix some stupid stuff

Change-Id: I92d4101a7c2f047d65b95239dbb59dcd99a01f4d