More issue #27 fixes.