Fix web component injection and interception