Improvements and cosmetics for Issue #281