diff --git a/src/typescript/frontend/src/lib/server-env.ts b/src/typescript/frontend/src/lib/server-env.ts
index 25dbfaeac..d4fc10c53 100644
--- a/src/typescript/frontend/src/lib/server-env.ts
+++ b/src/typescript/frontend/src/lib/server-env.ts
@@ -1,7 +1,7 @@
 import "server-only";
 import { APTOS_NETWORK, IS_ALLOWLIST_ENABLED } from "./env";
 import { Network } from "@aptos-labs/ts-sdk";
-import { EMOJICOIN_INDEXER_URL } from "@sdk/server-env";
+import { EMOJICOIN_INDEXER_URL } from "@sdk/server/env";
 
 if (typeof process.env.REVALIDATION_TIME === "undefined") {
   if (process.env.NODE) throw new Error("Environment variable REVALIDATION_TIME is undefined.");
diff --git a/src/typescript/frontend/src/lib/store/event/utils.ts b/src/typescript/frontend/src/lib/store/event/utils.ts
index 97b5de985..262dab87f 100644
--- a/src/typescript/frontend/src/lib/store/event/utils.ts
+++ b/src/typescript/frontend/src/lib/store/event/utils.ts
@@ -75,7 +75,7 @@ export const handleLatestBarForSwapEvent = (
       throw new Error("This should never occur. It is a type guard/hint.");
     } else if (event.market.marketNonce >= data.latestBar.marketNonce) {
       const price = q64ToBig(event.swap.avgExecutionPriceQ64).toNumber();
-      data.latestBar.time = Number(getPeriodStartTimeFromTime(event.market.time, period));
+      data.latestBar.time = Number(getPeriodStartTimeFromTime(event.market.time, period) / 1000n);
       data.latestBar.close = price;
       data.latestBar.high = Math.max(data.latestBar.high, price);
       data.latestBar.low = Math.min(data.latestBar.low, price);
diff --git a/src/typescript/sdk/src/indexer-v2/queries/client.ts b/src/typescript/sdk/src/indexer-v2/queries/client.ts
index 0cfb1b561..32b6e3a95 100644
--- a/src/typescript/sdk/src/indexer-v2/queries/client.ts
+++ b/src/typescript/sdk/src/indexer-v2/queries/client.ts
@@ -3,7 +3,7 @@ import "server-only";
 import { PostgrestClient } from "@supabase/postgrest-js";
 import { parseJSONWithBigInts, stringifyJSONWithBigInts } from "../json-bigint";
 import { type TableName } from "../types/json-types";
-import { EMOJICOIN_INDEXER_URL, FETCH_DEBUG, FETCH_DEBUG_VERBOSE } from "../../server-env";
+import { EMOJICOIN_INDEXER_URL, FETCH_DEBUG, FETCH_DEBUG_VERBOSE } from "../../server/env";
 
 /**
  * Fetch with BigInt support. This is necessary because the JSON returned by the indexer
diff --git a/src/typescript/sdk/src/server-env.ts b/src/typescript/sdk/src/server/env.ts
similarity index 97%
rename from src/typescript/sdk/src/server-env.ts
rename to src/typescript/sdk/src/server/env.ts
index cf28263bb..cb08a61f8 100644
--- a/src/typescript/sdk/src/server-env.ts
+++ b/src/typescript/sdk/src/server/env.ts
@@ -1,3 +1,5 @@
+import "server-only";
+
 if (typeof process.env.EMOJICOIN_INDEXER_URL === "undefined") {
   throw new Error("The indexer processor url must be defined.");
 } else {
diff --git a/src/typescript/sdk/tests/e2e/queries/testnet/simple.test.ts b/src/typescript/sdk/tests/e2e/queries/testnet/simple.test.ts
index 91f7baf19..c847fbcbe 100644
--- a/src/typescript/sdk/tests/e2e/queries/testnet/simple.test.ts
+++ b/src/typescript/sdk/tests/e2e/queries/testnet/simple.test.ts
@@ -1,7 +1,7 @@
 import { sleep } from "../../../../src";
 import { getLatestProcessedEmojicoinVersion, postgrest } from "../../../../src/indexer-v2/queries";
 import { TableName } from "../../../../src/indexer-v2/types/json-types";
-import { EMOJICOIN_INDEXER_URL } from "../../../../src/server-env";
+import { EMOJICOIN_INDEXER_URL } from "../../../../src/server/env";
 
 const API_KEY = process.env.EMOJICOIN_INDEXER_API_KEY!;
 
diff --git a/src/typescript/sdk/tests/e2e/schema.test.ts b/src/typescript/sdk/tests/e2e/schema.test.ts
index 434b30a3f..de4de1423 100644
--- a/src/typescript/sdk/tests/e2e/schema.test.ts
+++ b/src/typescript/sdk/tests/e2e/schema.test.ts
@@ -1,4 +1,4 @@
-import { EMOJICOIN_INDEXER_URL } from "../../src/server-env";
+import { EMOJICOIN_INDEXER_URL } from "../../src/server/env";
 import { type AnyColumnName, TableName } from "../../src/indexer-v2/types/json-types";
 import {
   floatColumns,