Tweak changes after merge of another branch.