Fixes for Issue #284