Fixed issues found in PR review.