Fixes for PR #64