Spec coverage cleanup

A few things I missed in the last PR.