Fixes for #80815, #80823, #80844 and #80785