Improve fixes for #1446