DT-1092, DT-1093, DT-1095 fixes