Small annoyances. Fixes #142.