Date problems fixed