Fixes for #1749