Fix errors in previous commit