Sonar recommended fixes