Bunch of small cleanups and fixes

I bundled together a bunch of small cleanups and fixes. Hopefully they are all non-controversial. Unfortunately some package dependencies got upgraded to latest versions (and this depends on a small voxel pull), so this will depend on actually publishing those versions.