diff --git a/libraries/net/include/psibase/blocknet.hpp b/libraries/net/include/psibase/blocknet.hpp
index f1857cbc9..4db6eb0be 100644
--- a/libraries/net/include/psibase/blocknet.hpp
+++ b/libraries/net/include/psibase/blocknet.hpp
@@ -202,6 +202,7 @@ namespace psibase::net
             }
          }
          assert(!"Unknown peer connection");
+         __builtin_unreachable();
       }
 
       void disconnect(peer_id id)
diff --git a/services/user/Nft/src/Nft.cpp b/services/user/Nft/src/Nft.cpp
index 346858dfe..91895c154 100644
--- a/services/user/Nft/src/Nft.cpp
+++ b/services/user/Nft/src/Nft.cpp
@@ -340,14 +340,14 @@ struct NftQuery
       return NftDetail
       {
          .id = nft->id,
+         .owner = UserDetail{
+            .account     = nft->owner,
+            .authService = owner->authService,
+         },
          .issuer = UserDetail{
             .account     = nft->issuer,
             .authService = issuer->authService,
          },
-         .owner = UserDetail{
-            .account     = nft->owner,
-            .authService = owner->authService,
-         }
       };
       // clang-format on
    }