Fix errors with previous commit