Comply to latest sonar advice