Misc updates

Cherry picking some internal commits.