Minor changes (cherry-pick from eab71f9)