Fix attribute and enumeration display