cosmetic fixes in ClientManager