Normalize DOM-handling; fix