Misc update

Change-Id: I8a7a6796b37171c9c962067ce7e86e5b388a14a6