dt2w fixes