Fixed date time issues