Major fix in CDataStream module.