Fixes for 3.35.92

We’ve just packaged 3.35.92 on EOS and needed these fixes to get it to build and pass tests. Hopefully they’re useful.

Merge request reports

Loading