spec improvements (REVIEW-3116)