1719

Fixes for #1719