Fixed set date bugs