Fixed some date logic for drafts