Fixes from the code review.