Data load fixes