Fix sonar issues holmes-common