Fixing unit conversion issues

[#53022701]