Minor fixes/improvements

Leaving open; none of these changes are urgent.