Belated collection of bug fixes. No new functionality.