Addressed recent review issues.