sonar fixes [RTFACT-17489]