[#39970349] Fix some more broken specs