Fixes from code review.