Few small changes, including Phantom server detection.