Fix uploads, avoid NaN dates