DOM fixup changes