Better zero values and date fields