Hopefully fix remaining Coverity issues (#45211, #45210, #44349)