Issue #60 fixes