More data load fixes