Misc updates

Change-Id: I4311d33b91c04de5da34f5c1cae406417f057a4e