Fix some issues with xmldata rereading