Small fixes based on feedback from David Kipling.