Minor spec improvements

+review REVIEW-5155