Resolved issues discovered in the code review process.