Fix entity.base and conversions to dates.
Fix dates.