client-data fixes