Fix errors introduced in previous commits