Fixes for Issue #60 and #84