Descriptor handling cleanups