Fixes for Issue#380