diff --git a/src/Core/Core.cpp b/src/Core/Core.cpp
index 89ead4ec..ba7d790b 100644
--- a/src/Core/Core.cpp
+++ b/src/Core/Core.cpp
@@ -4,12 +4,47 @@
 void init(rack::Plugin *p) {
 	p->slug = "Core";
 	p->version = TOSTRING(VERSION);
+	p->name = "Core";
+	p->author = "VCV";
+	p->license = "LGPL-3.0-only and BSD-3-Clause";
+	p->authorEmail = "contact@vcvrack.com";
+	p->pluginUrl = "https://vcvrack.com/";
+	p->authorUrl = "https://vcvrack.com/";
+	p->manualUrl = "https://vcvrack.com/manual/Core.html";
+	p->sourceUrl = "https://github.com/VCVRack/Rack";
 
+	modelAudioInterface->name = "Audio";
+	modelAudioInterface->description = "";
+	modelAudioInterface->tags = {"External"};
 	p->addModel(modelAudioInterface);
+
+	modelMIDIToCVInterface->name = "MIDI-1";
+	modelMIDIToCVInterface->description = "";
+	modelMIDIToCVInterface->tags = {"External", "MIDI"};
 	p->addModel(modelMIDIToCVInterface);
+
+	modelQuadMIDIToCVInterface->name = "MIDI-4";
+	modelQuadMIDIToCVInterface->description = "";
+	modelQuadMIDIToCVInterface->tags = {"External", "MIDI", "Quad"};
 	p->addModel(modelQuadMIDIToCVInterface);
+
+	modelMIDICCToCVInterface->name = "MIDI-CC";
+	modelMIDICCToCVInterface->description = "";
+	modelMIDICCToCVInterface->tags = {"External", "MIDI"};
 	p->addModel(modelMIDICCToCVInterface);
+
+	modelMIDITriggerToCVInterface->name = "MIDI-Trig";
+	modelMIDITriggerToCVInterface->description = "";
+	modelMIDITriggerToCVInterface->tags = {"External", "MIDI"};
 	p->addModel(modelMIDITriggerToCVInterface);
+
+	modelBlank->name = "Blank";
+	modelBlank->description = "";
+	modelBlank->tags = {"Blank"};
 	p->addModel(modelBlank);
+
+	modelNotes->name = "Notes";
+	modelNotes->description = "";
+	modelNotes->tags = {"Blank"};
 	p->addModel(modelNotes);
 }
diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp
index 4f8a8819..6fe38658 100644
--- a/src/app/ModuleWidget.cpp
+++ b/src/app/ModuleWidget.cpp
@@ -500,7 +500,7 @@ Menu *ModuleWidget::createContextMenu() {
 	Menu *menu = createMenu();
 
 	MenuLabel *menuLabel = new MenuLabel;
-	menuLabel->text = model->plugin->author + " " + model->name + " " + model->plugin->version;
+	menuLabel->text = model->plugin->name + " " + model->name + " " + model->plugin->version;
 	menu->addChild(menuLabel);
 
 	ModuleResetItem *resetItem = new ModuleResetItem;
diff --git a/src/plugin.cpp b/src/plugin.cpp
index 4864ac7b..55501cde 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -111,8 +111,8 @@ static bool loadPlugin(std::string path) {
 	Plugin *plugin = new Plugin;
 	plugin->path = path;
 	plugin->handle = handle;
-	initCallback(plugin);
 	plugin->fromJson(rootJ);
+	initCallback(plugin);
 
 	// Reject plugin if slug already exists
 	Plugin *oldPlugin = getPlugin(plugin->slug);