diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml
index fcd41705a..53107d5a7 100644
--- a/.github/workflows/audit_and_lint.yml
+++ b/.github/workflows/audit_and_lint.yml
@@ -68,7 +68,7 @@ jobs:
       - name: Upload lint results
         # run if lint failed and only on master/dev branch and pull requests
         if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
-        uses: github/codeql-action/upload-sarif@e86ea38e3f233a8bcf5afc904ee9fb422d5cf6e8 # pin@codeql-bundle-20210517
+        uses: github/codeql-action/upload-sarif@e891551dd4836643fb9f223d7ff08e83e8073534 # pin@codeql-bundle-20210517
         with:
           sarif_file: lint-results.sarif
         continue-on-error: true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index dfd577929..82e712723 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97 # pin@v2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e86ea38e3f233a8bcf5afc904ee9fb422d5cf6e8
+        uses: github/codeql-action/init@e891551dd4836643fb9f223d7ff08e83e8073534
         with:
           queries: security-and-quality
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e86ea38e3f233a8bcf5afc904ee9fb422d5cf6e8
+        uses: github/codeql-action/analyze@e891551dd4836643fb9f223d7ff08e83e8073534
diff --git a/commands/metamask.js b/commands/metamask.js
index 7ae865ffb..bb35919bb 100644
--- a/commands/metamask.js
+++ b/commands/metamask.js
@@ -412,6 +412,7 @@ module.exports = {
     }
     // metamask reloads popup after changing a fee, you have to wait for this event otherwise transaction will fail
     await puppeteer.metamaskWindow().waitForTimeout(3000);
+    await notificationPage.waitForFunction(`document.querySelector('${confirmPageElements.gasLimitInput}').value != "0"`);
     await puppeteer.waitAndClick(
       confirmPageElements.confirmButton,
       notificationPage,
diff --git a/commands/puppeteer.js b/commands/puppeteer.js
index fd10137dc..2865d187f 100644
--- a/commands/puppeteer.js
+++ b/commands/puppeteer.js
@@ -166,7 +166,7 @@ module.exports = {
   waitForText: async (selector, text, page = metamaskWindow) => {
     await module.exports.waitFor(selector, page);
     await page.waitForFunction(
-      `document.querySelector('${selector}').innerText.toLowerCase().includes('${text}')`,
+      `document.querySelector('${selector}').innerText.toLowerCase().includes('${text.toLowerCase()}')`,
     );
   },
 };