A few more fixes to issue #12.