Fix errors introduced by 50c6731927