Issue #96 code fixes