data marshaling fixes