Fixed some minor date related problems