Switched to using packaged WaitForServer