Issue #257 additional fixes