Fixes for code review.