Miscellaneous minor changes
Changelog in progress