Small changes to plugins