More date.c fixes