Fix sonar issues in EvacuateServer