Fixed more of the date stuff