Manage clients fixes