Fixes
Server selection