Add fixes based on Sonar reports