Fixing issues with the display of descriptors