Fix errors from the previous commit