Fix plugin creation

**DO NOT MERGE**

Just to track progress...