some more compliance fixes in the element classes