Changes to plugins and things