DESCRIPTORS: Extending 32/64b issue fix to descriptors

Part of #25.

Signed-off-by: G4m4 <misept.dieseneuf@gmail.com>