fix issues found in review