DEP-45 enable improvements