diff --git a/web/src/lib/go/wrapper/interface.ts b/web/src/lib/go/wrapper/interface.ts
index 16b2fadc..6cf332fc 100644
--- a/web/src/lib/go/wrapper/interface.ts
+++ b/web/src/lib/go/wrapper/interface.ts
@@ -18,7 +18,6 @@ export interface ImportObject {
    *
    * @deprecated
    * **WARNING:** Since Go 1.21.x this attribute was replaced by `gojs` namespace.
-   * @
    */
   go: { [k: string]: ImportFunction }
 
diff --git a/web/src/lib/go/wrapper/wrapper.ts b/web/src/lib/go/wrapper/wrapper.ts
index 608ca13f..b0efa617 100644
--- a/web/src/lib/go/wrapper/wrapper.ts
+++ b/web/src/lib/go/wrapper/wrapper.ts
@@ -27,7 +27,7 @@ export const getImportNamespace = (go: GoInstance) => (
  * @param overlay Overlay object
  * @param globalValue global namespace
  */
-export const wrapGlobal = (overlay: object = {}, globalValue: object = window || globalThis || DedicatedWorkerGlobalScope) => {
+export const wrapGlobal = (overlay: object = {}, globalValue: object = window || globalThis) => {
   const mockObject = {
     ...overlay,
     Go: GoWrapper,
diff --git a/web/src/store/dispatchers/build.ts b/web/src/store/dispatchers/build.ts
index 28ab268a..2c1045ef 100644
--- a/web/src/store/dispatchers/build.ts
+++ b/web/src/store/dispatchers/build.ts
@@ -54,6 +54,7 @@ const hasProgramTimeoutError = (events: EvalEvent[]) => {
 
 const dispatchEvalEvents = (dispatch: DispatchFn, events: EvalEvent[]) => {
   // TODO: support cancellation
+  dispatch(newProgramStartAction());
 
   if (!events?.length) {
     dispatch(newProgramFinishAction());
@@ -92,7 +93,6 @@ const dispatchEvalEvents = (dispatch: DispatchFn, events: EvalEvent[]) => {
   // approach used in official playground, so should be enough for us.
   let programEndTime = lastElem(eventsWithDelay)?.Delay ?? 0;
 
-  dispatch(newProgramStartAction());
   eventsWithDelay.forEach(event => {
     setTimeoutNanos(() => {
       dispatch(newProgramWriteAction(event))