Fixes for Issue#437