Fixes
Handle more date types
Propagate the density correctly