Fix issues found in review