fixes around date default handling