Bag of random fixes

This fixes some bugs, but I also unfortunately had to merge in 21.2 to fix a few conflicts. So the diff might be a bit of a mess, sorry @miochoa!