Spec updates suggested by @dkubb