This MR includes a variety of small fixes. It contains mostly segfault and regression fixes.
Feel free to bikeshed each commit.
Other less crutial fixes that we may want to include: