DEP-58 fixes