Improve fixes for #1453