More data fixes.