Updates / fixes to dtf