Updates to GridServer and SiteServer