Few small updates, including phantom server detection.