Small review-related fixes