Fixed EOY date bugs