Fix DataMap collections.