Spec improvements.