Fix errors - 2