Fixes in DOM tree