Fixes for Issue#426