Fix for truncated XML; change to time-stamps