More small fixes.

See CHANGES.rst.