Fixes for Issue #421