date and enum processing fixes