Work on review requests for 3.0