Attempt to fix #406, plus typo fix.
Attempt to fix #409.