Spec fix and more spec