DEP-45 parsing fixes