Minor fixes/improvements

Leaving open; none of these fixes are pressing.