Fix sonar issues with visibility