[#82377910] small fixes