Fixed some date problems