cherry-pick two minor changes from master