Minor spec cleanups