Fixes for Issue #154