Misc fixes
This takes some of the random flailing from #3 and pushes it to the mainline (since there's value).
Doesn't close any issues, but fixes misc stuff.
This takes some of the random flailing from #3 and pushes it to the mainline (since there's value).
Doesn't close any issues, but fixes misc stuff.