More small fixes.

See CHANGES.rst.
Merge branch 'dev'