Fix errors after the merge db930c3d976