Fixed null dates; two types of Date formats