Some updates to plugins