Fix errors to call class