fixes to case of date* elements