Fix errors and values