[#53022305] Bug fixes