Fixes for review issues.