[#883488] More fixes