Descriptor changes

Apparently I didn't commit all my changes