Fixes for #1419