TDE/DF changes

to placate #491