Fix errors introduced by 15ae56d99d9da407fd48f5aa3eed14ef1def2842