Fix errors from last commit