Several updates

Change-Id: I7656527b7563601d91ab6f29e7ac661c3f231212