Fixes DOM scope issues/nits.