Spec cleanups