Fix errors introduced by previous commit