Fix errors that Alex identified