More changes to custom elements.