[#78718578] Minor spec cleanup and fixes