Fix DataMap complaints