KRACOEUS-8010: fixing more bugs