DOM render fixes