Fixes for Issue #215