tweaks to NO_PLUGIN_STATE logic