diff --git a/src/Company/data/CompaniesMetadata.ts b/src/Company/data/CompaniesMetadata.ts
index ed855e3d3..ed1a4ae0a 100644
--- a/src/Company/data/CompaniesMetadata.ts
+++ b/src/Company/data/CompaniesMetadata.ts
@@ -8,6 +8,7 @@ import { IMap } from "../../types";
 const AllSoftwarePositions: IMap<boolean> = {};
 const AllITPositions: IMap<boolean> = {};
 const AllNetworkEngineerPositions: IMap<boolean> = {};
+const SecurityEngineerPositions: IMap<boolean> = {};
 const AllTechnologyPositions: IMap<boolean> = {};
 const AllBusinessPositions: IMap<boolean> = {};
 const AllAgentPositions: IMap<boolean> = {};
@@ -40,6 +41,7 @@ posNames.NetworkEngineerCompanyPositions.forEach((e) => {
 });
 
 AllTechnologyPositions[posNames.SecurityEngineerCompanyPositions[0]] = true;
+SecurityEngineerPositions[posNames.SecurityEngineerCompanyPositions[0]] = true;
 
 posNames.BusinessCompanyPositions.forEach((e) => {
     AllBusinessPositions[e] = true;
@@ -373,6 +375,7 @@ export const companiesMetadata: IConstructorParams[] = [
         companyPositions: Object.assign({},
             SoftwarePositionsUpToHeadOfEngineering,
             AllNetworkEngineerPositions,
+            SecurityEngineerPositions,
             AllITPositions,
             AllSecurityPositions,
             AllAgentPositions
@@ -387,6 +390,7 @@ export const companiesMetadata: IConstructorParams[] = [
         companyPositions: Object.assign({},
             SoftwarePositionsUpToHeadOfEngineering,
             AllNetworkEngineerPositions,
+            SecurityEngineerPositions,
             AllITPositions,
             AllSecurityPositions,
             AllAgentPositions
@@ -492,8 +496,9 @@ export const companiesMetadata: IConstructorParams[] = [
         info: "",
         companyPositions: Object.assign({},
             AllTechnologyPositions,
+            AllSoftwareConsultantPositions,
             AllAgentPositions,
-            AllSecurityPositions
+            AllSecurityPositions,
         ),
         expMultiplier: 1.2,
         salaryMultiplier: 1.2,
diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js
index bc9c9b167..d65efedd0 100644
--- a/src/NetscriptFunctions.js
+++ b/src/NetscriptFunctions.js
@@ -73,9 +73,6 @@ import {arrayToString}                              from "../utils/helpers/array
 import {createRandomIp}                             from "../utils/IPAddress";
 import {formatNumber, isHTML}                       from "../utils/StringHelperFunctions";
 import {isString}                                   from "../utils/helpers/isString";
-import {yesNoBoxClose, yesNoBoxGetYesButton,
-        yesNoBoxGetNoButton, yesNoBoxCreate,
-        yesNoBoxOpen}                               from "../utils/YesNoBox";
 
 import { createElement }                            from "../utils/uiHelpers/createElement";
 import { createPopup }                              from "../utils/uiHelpers/createPopup";
@@ -2475,10 +2472,6 @@ function NetscriptFunctions(workerScript) {
         },
         prompt : function(txt) {
             if (workerScript.checkingRam) {return 0;}
-            if (yesNoBoxOpen) {
-                workerScript.scriptRef.log("ERROR: confirm() failed because a pop-up dialog box is already open");
-                return false;
-            }
             if (!isString(txt)) {txt = String(txt);}
 
             // The id for this popup will consist of the first 20 characters of the prompt string..
diff --git a/src/PersonObjects/Sleeve/SleeveUI.ts b/src/PersonObjects/Sleeve/SleeveUI.ts
index aac680326..396b945b6 100644
--- a/src/PersonObjects/Sleeve/SleeveUI.ts
+++ b/src/PersonObjects/Sleeve/SleeveUI.ts
@@ -652,10 +652,12 @@ function setSleeveTask(sleeve: Sleeve, elems: ISleeveUIElems): boolean {
                 res = sleeve.workoutAtGym(playerRef!, detailValue2, detailValue);
                 break;
             case "Shock Recovery":
+                sleeve.finishTask(playerRef!);
                 sleeve.currentTask = SleeveTaskType.Recovery;
                 res = true;
                 break;
             case "Synchronize":
+                sleeve.finishTask(playerRef!);
                 sleeve.currentTask = SleeveTaskType.Sync;
                 res = true;
                 break;