Update to work more cleanly with non-.NET servers