Fixes in #5630