Spec cleanup

A couple different cleanups.