Minor fixes.
Part of fixing #1.