Fix errors introduced in the last merge