Fixes for Issue #1