KRACOEUS-7540 fixing stuff up