Attempt to fix issues when disabling/re-enabling addon.