Fixes in the the ClientStore and Client