Sonar bug fixes for SwitchManager.java