Fixes for #1451