Some fixes from code review.