spring - Assorted fixes
[#74319814]