Fix server auto discovery