Update server some more. Need to cleanup circular reference.