diff --git a/core/imageboard/image.php b/core/imageboard/image.php
index 78da4064..faec4c3f 100644
--- a/core/imageboard/image.php
+++ b/core/imageboard/image.php
@@ -86,7 +86,7 @@ class Image
         }
     }
 
-    #[Query(name: "post_by_id")]
+    #[Query(name: "post")]
     public static function by_id(int $id): ?Image
     {
         global $database;
diff --git a/ext/graphql/main.php b/ext/graphql/main.php
index 1bfbd135..4ecdbd7f 100644
--- a/ext/graphql/main.php
+++ b/ext/graphql/main.php
@@ -7,17 +7,27 @@ namespace Shimmie2;
 use GraphQL\GraphQL as GQL;
 use GraphQL\Server\StandardServer;
 use GraphQL\Error\DebugFlag;
+use GraphQL\Type\Schema;
 use GraphQL\Utils\SchemaPrinter;
 
 class GraphQL extends Extension
 {
+    public static function get_schema(): Schema
+    {
+        global $_tracer;
+        $_tracer->begin("Create Schema");
+        $schema = \GQLA\genSchema();
+        $_tracer->end(null);
+        return $schema;
+    }
+
     public function onPageRequest(PageRequestEvent $event)
     {
         global $page;
         if ($event->page_matches("graphql")) {
             $t1 = ftime();
             $server = new StandardServer([
-                'schema' => \GQLA\genSchema(),
+                'schema' => $this->get_schema(),
             ]);
             $t2 = ftime();
             $resp = $server->executeRequest();
@@ -36,13 +46,13 @@ class GraphQL extends Extension
     {
         if ($event->cmd == "help") {
             print "\tgraphql <query string>\n";
-            print "\t\teg 'graphql \"{ post_by_id(id: 18) { id, hash } }\"'\n\n";
+            print "\t\teg 'graphql \"{ post(id: 18) { id, hash } }\"'\n\n";
             print "\tgraphql-schema\n";
             print "\t\tdump the schema\n\n";
         }
         if ($event->cmd == "graphql") {
             $t1 = ftime();
-            $schema = \GQLA\genSchema();
+            $schema = $this->get_schema();
             $t2 = ftime();
             $debug = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::RETHROW_INTERNAL_EXCEPTIONS;
             $body = GQL::executeQuery($schema, $event->args[0])->toArray($debug);
@@ -53,7 +63,7 @@ class GraphQL extends Extension
             echo \json_encode($body, JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT);
         }
         if ($event->cmd == "graphql-schema") {
-            $schema = \GQLA\genSchema();
+            $schema = $this->get_schema();
             echo(SchemaPrinter::doPrint($schema));
         }
     }
diff --git a/ext/graphql/test.php b/ext/graphql/test.php
index e9185d56..db30ca7f 100644
--- a/ext/graphql/test.php
+++ b/ext/graphql/test.php
@@ -8,7 +8,7 @@ class GraphQLTest extends ShimmiePHPUnitTestCase
 {
     public function testSchema()
     {
-        $schema = \GQLA\genSchema();
+        $schema = GraphQL::get_schema();
         $schema->assertValid();
         $this->assertTrue(true);
     }
diff --git a/ext/pm/main.php b/ext/pm/main.php
index be45c93b..92c83967 100644
--- a/ext/pm/main.php
+++ b/ext/pm/main.php
@@ -96,7 +96,7 @@ class PM
         return $pms;
     }
 
-    #[Mutation("create_private_message")]
+    #[Mutation(name: "create_private_message")]
     public static function send_pm(int $to_id, string $subject, string $message): bool
     {
         global $user;