Replace missing stuff from manual merge.