[#8453] more fixes
3 files changed