Cherry pick a few updates