Fix RunServers issues