small fixes for dt/dr module change