Fix handling of server splits