Use useShadowDom = false + various small updates