REVIEW-2867: Minor spec updates