Adjustments to last patch based on review.