[PATCH 4/6] Cochran: Descriptor fixes