Added fixes from peer review.