Fixes for issue#426