fixes for data and controller serialization modules