Fix sonar issues in feature-state-management