Fiddling with the server detection stuff