Yet more fixes for GitHub issue #29.