Fix sonar issues + merge