date helper fixes