fix pluginIdentifier strings
fix static analysis issues