Fix errors from previous commit