Small Plugin fix

Fix two small issues with the new plugin system.

Ready to merge @Freyja