Fixes for code review issues.