More data fixes