Fix remaining specs

[#50752269]
[#49004623]
[#43219917]