Fixes review issues.