Fix failures introduced by the merge from master.