(maint) Fixup specs for 1.8.7