Fix some lost changes.

Merging multiple pull request caused some auto merging to lose
changes.