more timdata upload fixes