Adjustments for plugin correct functionality