Spec fixes