Fix expected date stuff