Attempting to fix certain issues when loading the plugin