Correct errors found on evaluation